fixes to support collective.geo.flexitopic