Readd user filtering back.