Support all of the geometry strings
Rename the helper and use an expiring url