SSP-2617 Preserve category/challenge filtered result set ordering
SSP-2617 Fix compilation error