Geo support and fixed