Fixing country codes I hope and hovering