Fix bugs with synonyms