adjust tag & destination handling to get all county type entities
Merge branch 'richard/tag-improvements'