SA Policy Geography continued cleanup

Handles new & edit states, saves geography data only as needed.