3532377: Fix decoration priorities

Alec Smrekarrequested to merge
issue/trash-3532377:3532377-aggregate-entity-queries into 3.x

Closes #3532377

Merge request reports