Remove invalid fields from filter and sort dropdowns and normalize display

Closes #3550058

Merge request reports

Loading