Refactor user filtering code, add multiple filtering functionality
Fix missing parameter