Fix filtering for users