fixes to context query to make sure we find synonyms