Fixing country code parsing