Resolver: Use unescaped query for search results, refs #1252