fixed location encoding in enums and added more locations to locations.json