refactor how the searches are handled. Assume developers know best, and pass entire full query