Added synonyms to tags to make suggestions
Updated case_match to use more readable constants