Simplified the build of the query used to enlarge advanced search to refinements.