Synonym and stemming updates

Various fixes for recent changes