Fix search query/result vars