Fix the sort order by changing the query instead of the filtered DAO when changing labels.