Revert geo id field name && allow dash in field name in configuration file