refactored Search#query