Sort All Fields at Once

Slattery, Stuartrequested to merge
(removed):sort_opt into master

This update sorts all fields simultaneously instead of individually to try to improve performance.

Merge request reports