Add some support for geo_suffix
Add missing forms
Add missing forms