[bug 1093714] Refine sort/filter UX