Tweaks and fixes so that full geo & community data is correctly saved.