Fix #2707 - Support GeoTour attribute

Also some minor changes to attritube generation files for
additional explanation