Fix user filtering