added better user filtering/sorting