Editing now nearly complete (though ugly). Just need to change the key now when country, subdivision, or locality is changed.
Reworked content props method which is much nicer now.