fix and improve geo styles management