Refactor require selector
Add where to return all matches against multiple attributes