Search\SearchQuery -> Search\Query
Refactor query visitor