More fixes to geo and modals