Fix sorting and filter on users