Finished refactoring filters; added user filter