WF-1602 - Fixed sorting custom columns.