Fixed geo issues