Been adding Wikidata tags to entries with good success.
First I added all the airports in Thailand using ICAO code which forms a unique key. Second I added railway stations, using their names in Thai, also with good success.
Next, will be adding Museums and Schools.