Not sure if we should add a pre-data action of what, but we should move the fix in #423 into the gmap class to avoid any spaghetti-ness if we can. Cross-reference #422
