User filter / controller refactoring / use merge in scopes