Updated Disambiguator with synonims control