Issue #797: More user-friendly labels for the term synonyms
Also fixed the search results