Use fetchas enum

Alex Pottrequested to merge
issue/entity_usage-3602750:3602750-use-fetchas-enum into 5.x

Closes #3602750

Merge request reports