Include search terms in all queries