fix user filtering bugs