Proper key the entity queue to avoid overlapping

Closes #3626994

Merge request reports

Loading
Loading