Tidy up the synonym searching on FTA

Added Borneo synonyms following some ZenDesk feedback. Improved it
generally to support multiple countries per synonym and generally be a
bit nicer.
Add Mallorca -> Spain synonym
Merge remote-tracking branch 'origin/more-ta-synonyms'