geoindex design fixes