Improved Synonym Search