UAR-756 Changes necessary to fix all Sort By options