Fixed issue expanding query synonyms