feat: #3566219 Move each entity count above its table

Steven Ayersrequested to merge
issue/crm-3566219:3566219-move-each-entity into 1.0.x

By: bluegeek9

Closes #3566219

Merge request reports