Refactoring towards unified handling of different geo-vocabs