diff --git a/system/telephony/apns-conf.xml b/system/telephony/apns-conf.xml
index 6c637b42..52bcde2d 100644
--- a/system/telephony/apns-conf.xml
+++ b/system/telephony/apns-conf.xml
@@ -14,39 +14,36 @@
      permissions and limitations under the License.
 -->
 <apns version="8">
-  <apn
-      carrier="Test Network"
-      mcc="001"
-      mnc="01"
-      apn=""
-      user="*"
-      server="*"
-      password="*"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+  <apn carrier="Test Network"
+        mcc="001"
+        mnc="01"
+        apn=""
+        user="*"
+        server="*"
+        password="*"
+        type="ims"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Test Network"
-      mcc="001"
-      mnc="01"
-      apn=""
-      user="*"
-      server="*"
-      password="*"
-      type="ia"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+  <apn carrier="Test Network"
+        mcc="001"
+        mnc="01"
+        apn=""
+        user="*"
+        server="*"
+        password="*"
+        type="ia"
+        protocol="IPV4V6"
+        roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cosmote Internet"
+
+  <apn carrier="Cosmote Internet"
       mcc="202"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="HOS"
+  <apn carrier="HOS"
       mcc="202"
       mnc="01"
       apn="hos"
@@ -58,8 +55,7 @@
       roaming_protocol="IP"
       bearer_bitmask="18"
   />
-  <apn
-      carrier="Cosmote Mms"
+  <apn carrier="Cosmote Mms"
       mcc="202"
       mnc="01"
       apn="mms"
@@ -68,15 +64,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vf Internet"
+  <apn carrier="Vf Internet"
       mcc="202"
       mnc="05"
       apn="internet.vodafone.gr"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Vf MMS"
+
+  <apn carrier="Vf MMS"
       mcc="202"
       mnc="05"
       apn="mms.vodafone.net"
@@ -87,8 +82,7 @@
       mmsport="5080"
       type="mms"
   />
-  <apn
-      carrier="Q-Telecom MMS GPRS"
+  <apn carrier="Q-Telecom MMS GPRS"
       mcc="202"
       mnc="09"
       apn="q-mms.myq.gr"
@@ -97,15 +91,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Wind Internet"
+  <apn carrier="Wind Internet"
       mcc="202"
       mnc="10"
       apn="gint.b-online.gr"
       type="default,supl"
   />
-  <apn
-      carrier="Wind MMS"
+  <apn carrier="Wind MMS"
       mcc="202"
       mnc="10"
       apn="mnet.b-online.gr"
@@ -114,20 +106,19 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="MVNO NL"
-      mcc="204"
-      mnc="03"
-      apn="internet.mvno.mobi"
-      user="mvno"
-      password="mvno"
-      authtype="1"
-      type="default,supl"
-      mvno_match_data="20403"
-      mvno_type="imsi"
+
+  <apn carrier="MVNO NL"
+     mcc="204"
+     mnc="03"
+     apn="internet.mvno.mobi"
+     user="mvno"
+     password="mvno"
+     authtype="1"
+     type="default,supl"
+     mvno_match_data="20403"
+     mvno_type="imsi"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="204"
       mnc="04"
       apn="truphone.com"
@@ -135,8 +126,7 @@
       mvno_match_data="204043914"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="204"
       mnc="04"
       apn="truphone.com"
@@ -144,21 +134,19 @@
       mvno_match_data="20404794"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="204"
       mnc="04"
       apn="live.vodafone.com"
       user="vodafone"
       password="vodafone"
-      authtype="1"
+      authtype ="1"
       mmsc="http://mmsc.mms.vodafone.nl"
       mmsproxy="192.168.251.150"
       mmsport="8799"
       type="default,supl,dun,mms"
   />
-  <apn
-      carrier="EHRPD - VZW Roaming Internet"
+  <apn carrier="EHRPD - VZW Roaming Internet"
       mcc="204"
       mnc="04"
       apn="VZWINTERNET"
@@ -173,8 +161,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="LTE - VZW Roaming Internet"
+  <apn carrier="LTE - VZW Roaming Internet"
       mcc="204"
       mnc="04"
       apn="VZWINTERNET"
@@ -188,8 +175,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="EHRPD - VZW Roaming FOTA"
+  <apn carrier="EHRPD - VZW Roaming FOTA"
       mcc="204"
       mnc="04"
       apn="VZWADMIN"
@@ -204,8 +190,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="LTE - VZW Roaming FOTA"
+  <apn carrier="LTE - VZW Roaming FOTA"
       mcc="204"
       mnc="04"
       apn="VZWADMIN"
@@ -219,8 +204,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="LTE - VZW Roaming IMS"
+  <apn carrier="LTE - VZW Roaming IMS"
       mcc="204"
       mnc="04"
       apn="IMS"
@@ -234,8 +218,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="EHRPD - VZW Roaming IMS"
+  <apn carrier="EHRPD - VZW Roaming IMS"
       mcc="204"
       mnc="04"
       apn="IMS"
@@ -250,8 +233,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="LTE - VZW Roaming CBS"
+  <apn carrier="LTE - VZW Roaming CBS"
       mcc="204"
       mnc="04"
       apn="VZWAPP"
@@ -266,8 +248,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="EHRPD - VZW Roaming CBS"
+  <apn carrier="EHRPD - VZW Roaming CBS"
       mcc="204"
       mnc="04"
       apn="VZWAPP"
@@ -283,15 +264,14 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="CSpire international"
+  <apn carrier="CSpire international"
       mcc="204"
       mnc="04"
       apn="internet.cs4glte.com"
       server="*"
       user="Uniroam@inet.cs.com"
       password="cs3g"
-      authtype="3"
+      authtype ="3"
       mmsport=""
       mmsproxy=""
       mmsc="http://pix.cspire.com"
@@ -300,8 +280,7 @@
       type="default,internet,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire international"
+  <apn carrier="CSpire international"
       mcc="204"
       mnc="04"
       apn="admin.cs4glte.com"
@@ -314,8 +293,7 @@
       type="admin,fota,ota"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire international"
+  <apn carrier="CSpire international"
       mcc="204"
       mnc="04"
       apn="tethering.cs4glte.com"
@@ -328,8 +306,7 @@
       type="dun,pam"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="SaskTel"
+  <apn carrier="SaskTel"
       mcc="204"
       mnc="04"
       apn="pda.stm.sk.ca"
@@ -340,8 +317,7 @@
       mvno_match_data="5A"
       mvno_type="gid"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="204"
       mnc="04"
@@ -354,8 +330,7 @@
       mvno_type="iccid"
       mvno_match_data="898603,898611,8985231,8985302,8985307"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="204"
       mnc="04"
@@ -370,8 +345,7 @@
       mvno_type="iccid"
       mvno_match_data="898603,898611,8985231,8985302,8985307"
   />
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="204"
@@ -382,8 +356,7 @@
       mvno_type="iccid"
       mvno_match_data="898603,898611,8985231,8985302,8985307"
   />
-  <apn
-      carrier="KPN/Hi 4G LTE Mobiel internet"
+  <apn carrier="KPN/Hi 4G LTE Mobiel internet"
       mcc="204"
       mnc="08"
       apn="KPN4G.nl"
@@ -392,8 +365,7 @@
       mmsport="5080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="KPN/Hi Mobiel Internet"
+  <apn carrier="KPN/Hi Mobiel Internet"
       mcc="204"
       mnc="08"
       apn="portalmmm.nl"
@@ -402,20 +374,18 @@
       mmsport="5080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="MVNO NL"
-      mcc="204"
-      mnc="08"
-      apn="internet.mvno.mobi"
-      user="mvno"
-      password="mvno"
-      authtype="1"
-      type="default,supl"
-      mvno_match_data="204080950"
-      mvno_type="imsi"
+  <apn carrier="MVNO NL"
+     mcc="204"
+     mnc="08"
+     apn="internet.mvno.mobi"
+     user="mvno"
+     password="mvno"
+     authtype="1"
+     type="default,supl"
+     mvno_match_data="204080950"
+     mvno_type="imsi"
   />
-  <apn
-      carrier="Rabo Mobiel Int."
+  <apn carrier="Rabo Mobiel Int."
       mcc="204"
       mnc="08"
       apn="rabo"
@@ -423,8 +393,7 @@
       mvno_match_data="Rabo Mobiel"
       mvno_type="spn"
   />
-  <apn
-      carrier="Rabo Mobiel MMS"
+  <apn carrier="Rabo Mobiel MMS"
       mcc="204"
       mnc="08"
       apn="rabo"
@@ -435,8 +404,7 @@
       mvno_match_data="Rabo Mobiel"
       mvno_type="spn"
   />
-  <apn
-      carrier="Telfort Internet"
+  <apn carrier="Telfort Internet"
       mcc="204"
       mnc="12"
       apn="internet"
@@ -445,8 +413,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="16"
       apn="smartsites.t-mobile"
@@ -454,8 +421,7 @@
       roaming_protocol="IPV4"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile NL IMS"
+  <apn carrier="T-Mobile NL IMS"
       mcc="204"
       mnc="16"
       apn="ims"
@@ -463,8 +429,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Ben Internet Abonnee"
+  <apn carrier="Ben Internet Abonnee"
       mcc="204"
       mnc="16"
       apn="internet.ben"
@@ -472,8 +437,7 @@
       mvno_match_data="BEN NL"
       mvno_type="spn"
   />
-  <apn
-      carrier="Ben Internet PrePaid"
+  <apn carrier="Ben Internet PrePaid"
       mcc="204"
       mnc="16"
       apn="basic.internet.ben.data"
@@ -481,8 +445,7 @@
       mvno_match_data="BEN NL"
       mvno_type="spn"
   />
-  <apn
-      carrier="Ben MMS"
+  <apn carrier="Ben MMS"
       mcc="204"
       mnc="16"
       apn="mms.ben"
@@ -494,8 +457,7 @@
       mvno_match_data="BEN NL"
       mvno_type="spn"
   />
-  <apn
-      carrier="Tele2 NL"
+  <apn carrier="Tele2 NL"
       mcc="204"
       mnc="16"
       apn="internet.tele2.nl"
@@ -505,8 +467,7 @@
       mvno_type="gid"
       mvno_match_data="8F"
   />
-  <apn
-      carrier="Tele2 NL IMS"
+  <apn carrier="Tele2 NL IMS"
       mcc="204"
       mnc="16"
       apn="ims"
@@ -516,8 +477,7 @@
       mvno_type="gid"
       mvno_match_data="8F"
   />
-  <apn
-      carrier="Tele2 NL"
+  <apn carrier="Tele2 NL"
       mcc="204"
       mnc="16"
       apn="internet.tele2.nl"
@@ -527,8 +487,7 @@
       mvno_type="gid"
       mvno_match_data="4E4C"
   />
-  <apn
-      carrier="Tele2 NL IMS"
+  <apn carrier="Tele2 NL IMS"
       mcc="204"
       mnc="16"
       apn="ims"
@@ -538,8 +497,7 @@
       mvno_type="gid"
       mvno_match_data="4E4C"
   />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile Internet"
       mcc="204"
       mnc="20"
       apn="smartsites.t-mobile"
@@ -547,8 +505,7 @@
       roaming_protocol="IPV4"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile NL IMS"
+  <apn carrier="T-Mobile NL IMS"
       mcc="204"
       mnc="20"
       apn="ims"
@@ -556,15 +513,14 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="agms"
+  <apn carrier="agms"
       mcc="204"
       mnc="65"
       apn="agms"
       type="default,supl"
   />
-  <apn
-      carrier="Proximus MMS"
+
+  <apn carrier="Proximus MMS"
       mcc="206"
       mnc="01"
       apn="event.proximus.be"
@@ -575,36 +531,32 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Proximus Internet"
+  <apn carrier="Proximus Internet"
       mcc="206"
       mnc="01"
       apn="internet.proximus.be"
       type="default,supl"
   />
-  <apn
-      carrier="Telenet Internet"
-      mcc="206"
-      mnc="01"
-      mvno_match_data="2060188"
-      mvno_type="imsi"
-      apn="telenetwap.be"
-      type="default,supl"
+  <apn carrier="Telenet Internet"
+       mcc="206"
+       mnc="01"
+       mvno_match_data="2060188"
+       mvno_type="imsi"
+       apn="telenetwap.be"
+       type="default,supl"
   />
-  <apn
-      carrier="Telenet MMS"
-      mcc="206"
-      mnc="01"
-      mvno_match_data="2060188"
-      mvno_type="imsi"
-      apn="mms.be"
-      mmsc="http://mmsc.telenet.be"
-      mmsproxy="195.130.149.100"
-      mmsport="80"
-      type="mms"
+  <apn carrier="Telenet MMS"
+       mcc="206"
+       mnc="01"
+       mvno_match_data="2060188"
+       mvno_type="imsi"
+       apn="mms.be"
+       mmsc="http://mmsc.telenet.be"
+       mmsproxy="195.130.149.100"
+       mmsport="80"
+       type="mms"
   />
-  <apn
-      carrier="Virgin mobile"
+  <apn carrier="Virgin mobile"
       mcc="206"
       mnc="01"
       apn="virgin-mobile.fr"
@@ -614,8 +566,7 @@
       mvno_match_data="52"
       mvno_type="gid"
   />
-  <apn
-      carrier="VM MMS"
+  <apn carrier="VM MMS"
       mcc="206"
       mnc="01"
       apn="virgin-mobile.fr"
@@ -626,8 +577,7 @@
       mvno_match_data="52"
       mvno_type="gid"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="206"
       mnc="01"
       apn="mms.mobi.eastlink.ca"
@@ -638,8 +588,7 @@
       mvno_match_data="B6"
       mvno_type="gid"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="206"
       mnc="01"
       apn="wisp.mobi.eastlink.ca"
@@ -647,8 +596,7 @@
       mvno_match_data="B6"
       mvno_type="gid"
   />
-  <apn
-      carrier="NRJMMS"
+  <apn carrier="NRJMMS"
       mcc="206"
       mnc="01"
       apn="event.proximus.be"
@@ -662,8 +610,7 @@
       mvno_type="spn"
       mvno_match_data="NRJ Mobile"
   />
-  <apn
-      carrier="NRJWEB"
+  <apn carrier="NRJWEB"
       mcc="206"
       mnc="01"
       apn="internet.proximus.be"
@@ -672,8 +619,7 @@
       mvno_type="spn"
       mvno_match_data="NRJ Mobile"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="206"
       mnc="01"
       apn="mms.iusacellgsm.mx"
@@ -685,8 +631,7 @@
       mvno_type="spn"
       mvno_match_data="UNEFON"
   />
-  <apn
-      carrier="MODEM"
+  <apn carrier="MODEM"
       mcc="206"
       mnc="01"
       apn="modem.iusacellgsm.mx"
@@ -697,8 +642,7 @@
       mvno_type="spn"
       mvno_match_data="UNEFON"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="206"
       mnc="01"
       apn="web.iusacellgsm.mx"
@@ -709,8 +653,7 @@
       mvno_type="spn"
       mvno_match_data="UNEFON"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="206"
       mnc="01"
       apn="mms.iusacellgsm.mx"
@@ -722,8 +665,7 @@
       mvno_type="spn"
       mvno_match_data="IUSACELL"
   />
-  <apn
-      carrier="MODEM"
+  <apn carrier="MODEM"
       mcc="206"
       mnc="01"
       apn="modem.iusacellgsm.mx"
@@ -734,8 +676,7 @@
       mvno_type="spn"
       mvno_match_data="IUSACELL"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="206"
       mnc="01"
       apn="web.iusacellgsm.mx"
@@ -746,15 +687,13 @@
       mvno_type="spn"
       mvno_match_data="IUSACELL"
   />
-  <apn
-      carrier="Telenet Internet"
+  <apn carrier="Telenet Internet"
       mcc="206"
       mnc="05"
       apn="telenetwap.be"
       type="default,supl"
   />
-  <apn
-      carrier="Telenet MMS"
+  <apn carrier="Telenet MMS"
       mcc="206"
       mnc="05"
       apn="mms.be"
@@ -763,8 +702,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Mobistar MMS"
+  <apn carrier="Mobistar MMS"
       mcc="206"
       mnc="10"
       apn="mms.be"
@@ -775,8 +713,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Mobistar Internet"
+  <apn carrier="Mobistar Internet"
       mcc="206"
       mnc="10"
       apn="mworld.be"
@@ -788,8 +725,7 @@
       type="default,wap"
       user_editable="0"
   />
-  <apn
-      carrier="Base"
+  <apn carrier="Base"
       mcc="206"
       mnc="20"
       apn="gprs.base.be"
@@ -799,8 +735,7 @@
       port="5080"
       type="default,supl"
   />
-  <apn
-      carrier="BASE MMS"
+  <apn carrier="BASE MMS"
       mcc="206"
       mnc="20"
       apn="mms.base.be"
@@ -811,8 +746,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange World IMS"
+
+  <apn carrier="Orange World IMS"
       mcc="208"
       mnc="01"
       apn="ims"
@@ -820,8 +755,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Orange World"
+  <apn carrier="Orange World"
       mcc="208"
       mnc="01"
       apn="orange"
@@ -832,8 +766,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Orange MMS WiFi"
+ <apn carrier="Orange MMS WiFi"
       mcc="208"
       mnc="01"
       apn="vowifiorange"
@@ -845,8 +778,7 @@
       type="mms"
       bearer_bitmask="18"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="208"
       mnc="01"
       apn="orange"
@@ -858,8 +790,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Orange Entreprise"
+  <apn carrier="Orange Entreprise"
       mcc="208"
       mnc="01"
       apn="orange-mib"
@@ -870,8 +801,7 @@
       authtype="2"
       type="default"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="208"
       mnc="01"
       apn="orange.fr"
@@ -880,8 +810,7 @@
       type="default,dun"
       user_editable="0"
   />
-  <apn
-      carrier="SFR webphone"
+  <apn carrier="SFR webphone"
       mcc="208"
       mnc="09"
       apn="sl2sfr"
@@ -891,30 +820,26 @@
       protocol="IP"
       type="default,mms,supl,agps,fota"
   />
-  <apn
-      carrier="SFR option modem"
+  <apn carrier="SFR option modem"
       mcc="208"
       mnc="09"
       apn="websfr"
       protocol="IP"
       type="dun"
   />
-  <apn
-      carrier="SFR webphone"
+  <apn carrier="SFR webphone"
       mcc="208"
       mnc="10"
       apn="sl2sfr"
       type="default,supl"
   />
-  <apn
-      carrier="SFR Mobile"
+  <apn carrier="SFR Mobile"
       mcc="208"
       mnc="10"
       apn="wapsfr"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="208"
       mnc="10"
       apn="mmssfr"
@@ -923,8 +848,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SFR webphone"
+  <apn carrier="SFR webphone"
       mcc="208"
       mnc="10"
       apn="sl2sfr"
@@ -933,16 +857,14 @@
       mmsport="8080"
       type="default,mms,supl"
   />
-  <apn
-      carrier="SFR option Modem"
+  <apn carrier="SFR option Modem"
       mcc="208"
       mnc="10"
       apn="websfr"
       authtype="0"
       type="dun"
   />
-  <apn
-      carrier="INTERNET NRJ"
+  <apn carrier="INTERNET NRJ"
       mcc="208"
       mnc="10"
       apn="internetnrj"
@@ -951,8 +873,7 @@
       mvno_type="gid"
       mvno_match_data="4E"
   />
-  <apn
-      carrier="Auchan WAP"
+  <apn carrier="Auchan WAP"
       mcc="208"
       mnc="10"
       apn="wap65"
@@ -960,8 +881,7 @@
       mvno_match_data="A MOBILE"
       mvno_type="spn"
   />
-  <apn
-      carrier="WAP Simplicime"
+  <apn carrier="WAP Simplicime"
       mcc="208"
       mnc="10"
       proxy="192.168.21.3"
@@ -969,8 +889,7 @@
       apn="wapdebitel"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Simplicime"
+  <apn carrier="MMS Simplicime"
       mcc="208"
       mnc="10"
       mmsc="http://mmsdebitel"
@@ -979,8 +898,7 @@
       apn="mmsdebitel"
       type="mms"
   />
-  <apn
-      carrier="Auchan MMS"
+  <apn carrier="Auchan MMS"
       mcc="208"
       mnc="10"
       mmsc="http://mms65"
@@ -991,8 +909,7 @@
       mvno_match_data="A MOBILE"
       mvno_type="spn"
   />
-  <apn
-      carrier="WAP LeclercMobile"
+  <apn carrier="WAP LeclercMobile"
       mcc="208"
       mnc="10"
       mvno_match_data="LeclercMobile"
@@ -1002,8 +919,7 @@
       apn="wap66"
       type="default,supl"
   />
-  <apn
-      carrier="MMS LeclercMobile"
+  <apn carrier="MMS LeclercMobile"
       mcc="208"
       mnc="10"
       mvno_match_data="LeclercMobile"
@@ -1014,8 +930,7 @@
       apn="mms66"
       type="mms"
   />
-  <apn
-      carrier="Coriolis WAP"
+  <apn carrier="Coriolis WAP"
       mcc="208"
       mnc="10"
       apn="fnetcoriolis"
@@ -1023,8 +938,7 @@
       mvno_match_data="12"
       mvno_type="gid"
   />
-  <apn
-      carrier="Coriolis MMS"
+  <apn carrier="Coriolis MMS"
       mcc="208"
       mnc="10"
       mvno_match_data="12"
@@ -1035,8 +949,7 @@
       apn="mmscoriolis"
       type="mms"
   />
-  <apn
-      carrier="Coriolis WEB"
+  <apn carrier="Coriolis WEB"
       mcc="208"
       mnc="10"
       apn="internetcoriolis"
@@ -1045,8 +958,7 @@
       mvno_type="gid"
       mvno_match_data="12"
   />
-  <apn
-      carrier="WEB La Poste Mobile"
+  <apn carrier="WEB La Poste Mobile"
       mcc="208"
       mnc="10"
       proxy="192.168.21.3"
@@ -1059,8 +971,7 @@
       mvno_match_data="4C"
       mvno_type="gid"
   />
-  <apn
-      carrier="Darty Surf&amp;Mails"
+  <apn carrier="Darty Surf&amp;Mails"
       mcc="208"
       mnc="10"
       apn="wap68"
@@ -1070,8 +981,7 @@
       mvno_match_data="44"
       mvno_type="gid"
   />
-  <apn
-      carrier="Darty MMS"
+  <apn carrier="Darty MMS"
       mcc="208"
       mnc="10"
       apn="mms68"
@@ -1082,21 +992,17 @@
       mvno_match_data="44"
       mvno_type="gid"
   />
-  <apn
-      carrier="Keyyo Mobile Internet"
+  <apn carrier="Keyyo Mobile Internet"
       mcc="208"
       mnc="10"
-      apn="internet68"
-      authtype="0"
+      apn="internet68" authtype="0"
       type="default,supl,agps,fota,dun"
       mvno_type="spn"
       mvno_match_data="Keyyo Mobile"
   />
-  <apn
-      carrier="Keyyo Mobile MMS"
+  <apn carrier="Keyyo Mobile MMS"
       mcc="208"
-      mnc="10"
-      mvno_type="spn"
+      mnc="10" mvno_type="spn"
       mvno_match_data="Keyyo Mobile"
       mmsc="http://mms68"
       mmsproxy="10.143.156.11"
@@ -1104,8 +1010,7 @@
       apn="mms68"
       type="mms"
   />
-  <apn
-      carrier="Keyyo Mobile Wap"
+  <apn carrier="Keyyo Mobile Wap"
       mcc="208"
       mnc="10"
       apn="wap68"
@@ -1116,8 +1021,7 @@
       mvno_type="spn"
       mvno_match_data="Keyyo Mobile"
   />
-  <apn
-      carrier="Zero forfait"
+  <apn carrier="Zero forfait"
       mcc="208"
       mnc="10"
       apn="internet68"
@@ -1126,8 +1030,7 @@
       mvno_type="spn"
       mvno_match_data="ZERO FORFAIT"
   />
-  <apn
-      carrier="Zero forfait MMS"
+  <apn carrier="Zero forfait MMS"
       mcc="208"
       mnc="10"
       apn="mms68"
@@ -1139,8 +1042,7 @@
       mvno_type="spn"
       mvno_match_data="ZERO FORFAIT"
   />
-  <apn
-      carrier="WAP RegloMobile"
+  <apn carrier="WAP RegloMobile"
       mcc="208"
       mnc="10"
       apn="wap66"
@@ -1151,8 +1053,7 @@
       mvno_type="spn"
       mvno_match_data="RegloMobile"
   />
-  <apn
-      carrier="MMS RegloMobile"
+    <apn carrier="MMS RegloMobile"
       mcc="208"
       mnc="10"
       apn="mms66"
@@ -1164,8 +1065,7 @@
       mvno_type="spn"
       mvno_match_data="RegloMobile"
   />
-  <apn
-      carrier="Internet Joe"
+  <apn carrier="Internet Joe"
       mcc="208"
       mnc="10"
       apn="sl2sfr"
@@ -1177,8 +1077,7 @@
       mvno_type="gid"
       mvno_match_data="53"
   />
-  <apn
-      carrier="Modem Joe"
+  <apn carrier="Modem Joe"
       mcc="208"
       mnc="10"
       apn="websfr"
@@ -1187,8 +1086,7 @@
       mvno_type="gid"
       mvno_match_data="53"
   />
-  <apn
-      carrier="SFR webphone"
+  <apn carrier="SFR webphone"
       mcc="208"
       mnc="11"
       apn="sl2sfr"
@@ -1198,8 +1096,7 @@
       protocol="IP"
       type="default,mms,supl,fota"
   />
-  <apn
-      carrier="SFR webphone"
+  <apn carrier="SFR webphone"
       mcc="208"
       mnc="13"
       apn="sl2sfr"
@@ -1209,38 +1106,33 @@
       protocol="IP"
       type="default,mms,supl,fota"
   />
-  <apn
-      carrier="Free"
+  <apn carrier="Free"
       mcc="208"
       mnc="15"
       apn="free"
       type="default,supl"
   />
-  <apn
-      carrier="Free MMS"
+  <apn carrier="Free MMS"
       mcc="208"
       mnc="15"
       mmsc="http://mms.free.fr"
       apn="mmsfree"
       type="mms"
   />
-  <apn
-      carrier="Legos"
+  <apn carrier="Legos"
       mcc="208"
       mnc="17"
       apn="bornsip"
       type="default,supl"
   />
-  <apn
-      carrier="Legos MMS"
+  <apn carrier="Legos MMS"
       mcc="208"
       mnc="17"
       mmsc="http://mms.bornsip.fr:8191"
       apn="bornsipmms"
       type="mms"
   />
-  <apn
-      carrier="Bouygues Telecom"
+  <apn carrier="Bouygues Telecom"
       mcc="208"
       mnc="20"
       apn="mmsbouygtel.com"
@@ -1249,8 +1141,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Bouygues IMS"
+  <apn carrier="Bouygues IMS"
       mcc="208"
       mnc="20"
       apn="ims"
@@ -1258,8 +1149,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Virgin mobile"
+  <apn carrier="Virgin mobile"
       mcc="208"
       mnc="23"
       apn="virgin-mobile.fr"
@@ -1269,8 +1159,7 @@
       mvno_match_data="52"
       mvno_type="gid"
   />
-  <apn
-      carrier="VM MMS"
+  <apn carrier="VM MMS"
       mcc="208"
       mnc="23"
       apn="virgin-mobile.fr"
@@ -1281,8 +1170,7 @@
       mvno_match_data="52"
       mvno_type="gid"
   />
-  <apn
-      carrier="NRJ WEB"
+  <apn carrier="NRJ WEB"
       mcc="208"
       mnc="26"
       apn="fnetnrj"
@@ -1290,8 +1178,7 @@
       mvno_match_data="4E"
       mvno_type="gid"
   />
-  <apn
-      carrier="NRJ MMS"
+  <apn carrier="NRJ MMS"
       mcc="208"
       mnc="26"
       apn="mmsnrj"
@@ -1302,8 +1189,8 @@
       mvno_match_data="4E"
       mvno_type="gid"
   />
-  <apn
-      carrier="Internet móvil"
+
+  <apn carrier="Internet móvil"
       mcc="214"
       mnc="01"
       apn="airtelwap.es"
@@ -1311,8 +1198,7 @@
       password="wap125"
       type="default,supl"
   />
-  <apn
-      carrier="INTERNET"
+  <apn carrier="INTERNET"
       mcc="214"
       mnc="01"
       apn="airtelnet.es"
@@ -1320,8 +1206,7 @@
       password="vodafone"
       type="dun"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="214"
       mnc="01"
       apn="mms.vodafone.net"
@@ -1332,8 +1217,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Orange IMS"
+  <apn carrier="Orange IMS"
       mcc="214"
       mnc="03"
       apn="ims"
@@ -1341,8 +1225,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Orange Internet Móvil"
+  <apn carrier="Orange Internet Móvil"
       mcc="214"
       mnc="03"
       apn="orangeworld"
@@ -1352,8 +1235,7 @@
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="214"
       mnc="03"
       apn="orangemms"
@@ -1365,8 +1247,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Orange Internet PC"
+  <apn carrier="Orange Internet PC"
       mcc="214"
       mnc="03"
       apn="internet"
@@ -1375,15 +1256,13 @@
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="Yoigo Internet"
+  <apn carrier="Yoigo Internet"
       mcc="214"
       mnc="04"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Yoigo MMS"
+  <apn carrier="Yoigo MMS"
       mcc="214"
       mnc="04"
       apn="mms"
@@ -1392,8 +1271,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Movistar"
+  <apn carrier="Movistar"
       mcc="214"
       mnc="05"
       apn="telefonica.es"
@@ -1405,24 +1283,21 @@
       authtype="1"
       type="default,mms"
   />
-  <apn
-      carrier="Movistar XCAP"
+  <apn carrier="Movistar XCAP"
       mcc="214"
       mnc="05"
       apn="XCAP"
       type="supl"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="Movistar IMS"
+  <apn carrier="Movistar IMS"
       mcc="214"
       mnc="05"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="Tuenti"
+  <apn carrier="Tuenti"
       mcc="214"
       mnc="05"
       apn="tuenti.com"
@@ -1433,8 +1308,7 @@
       mmsproxy="10.138.255.43"
       mmsport="8080"
   />
-  <apn
-      carrier="INTERNET GPRS"
+  <apn carrier="INTERNET GPRS"
       mcc="214"
       mnc="06"
       apn="airtelnet.es"
@@ -1442,8 +1316,7 @@
       password="vodafone"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Vodafone"
+  <apn carrier="MMS Vodafone"
       mcc="214"
       mnc="06"
       apn="mms.vodafone.net"
@@ -1454,8 +1327,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Euskaltel MMS"
+  <apn carrier="Euskaltel MMS"
       mcc="214"
       mnc="06"
       mvno_match_data="0008"
@@ -1469,8 +1341,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Euskaltel Internet"
+  <apn carrier="Euskaltel Internet"
       mcc="214"
       mnc="06"
       mvno_match_data="0008"
@@ -1481,8 +1352,7 @@
       password="EUSKALTEL"
       type="default,supl"
   />
-  <apn
-      carrier="Internet R"
+  <apn carrier="Internet R"
       mcc="214"
       mnc="06"
       mvno_match_data="2140612"
@@ -1491,8 +1361,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS R"
+  <apn carrier="MMS R"
       mcc="214"
       mnc="06"
       apn="mms.mundo-r.com"
@@ -1504,11 +1373,9 @@
       mvno_match_data="2140612"
       mvno_type="imsi"
   />
-  <apn
-      carrier="TeleCable Internet"
+  <apn carrier="TeleCable Internet"
       mcc="214"
-      mnc="06"
-      mvno_match_data="2140613"
+      mnc="06" mvno_match_data="2140613"
       mvno_type="imsi"
       apn="internet.telecable.es"
       authtype="1"
@@ -1516,8 +1383,7 @@
       password="telecable"
       type="default,supl"
   />
-  <apn
-      carrier="MMS R"
+  <apn carrier="MMS R"
       mcc="214"
       mnc="06"
       apn="euskaltelmms.euskaltel.mobi"
@@ -1526,8 +1392,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="TeleCable MMS"
+  <apn carrier="TeleCable MMS"
       mcc="214"
       mnc="06"
       mvno_match_data="2140613"
@@ -1541,8 +1406,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Eroski Movil GPRS"
+  <apn carrier="Eroski Movil GPRS"
       mcc="214"
       mnc="06"
       apn="gprs.eroskimovil.es"
@@ -1553,8 +1417,7 @@
       mvno_match_data="2140606"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Eroski Movil MMS"
+  <apn carrier="Eroski Movil MMS"
       mcc="214"
       mnc="06"
       apn="mms.eroskimovil.es"
@@ -1568,8 +1431,7 @@
       mvno_match_data="2140606"
       mvno_type="imsi"
   />
-  <apn
-      carrier="DUN"
+  <apn carrier="DUN"
       mcc="214"
       mnc="06"
       apn="gprs.pepephone.com"
@@ -1578,8 +1440,7 @@
       mvno_type="spn"
       mvno_match_data="pepephone"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="214"
       mnc="06"
       apn="gprsmov.pepephone.com"
@@ -1588,11 +1449,9 @@
       mvno_type="spn"
       mvno_match_data="pepephone"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="214"
-      mnc="06"
-      mvno_type="spn"
+      mnc="06" mvno_type="spn"
       mvno_match_data="pepephone"
       apn="mms.pepephone.com"
       authtype="0"
@@ -1603,8 +1462,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Movistar"
+  <apn carrier="Movistar"
       mcc="214"
       mnc="07"
       apn="telefonica.es"
@@ -1616,24 +1474,21 @@
       authtype="1"
       type="default,mms"
   />
-  <apn
-      carrier="Movistar XCAP"
+  <apn carrier="Movistar XCAP"
       mcc="214"
       mnc="07"
       apn="XCAP"
       type="supl"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="Movistar IMS"
+  <apn carrier="Movistar IMS"
       mcc="214"
       mnc="07"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="Euskaltel MMS"
+  <apn carrier="Euskaltel MMS"
       mcc="214"
       mnc="08"
       apn="euskaltelmms.euskaltel.mobi"
@@ -1644,8 +1499,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Euskaltel Internet"
+  <apn carrier="Euskaltel Internet"
       mcc="214"
       mnc="08"
       apn="internet.euskaltel.mobi"
@@ -1653,8 +1507,7 @@
       password="EUSKALTEL"
       type="default,supl"
   />
-  <apn
-      carrier="TeleCable Internet"
+  <apn carrier="TeleCable Internet"
       mcc="214"
       mnc="16"
       apn="internet.telecable.es"
@@ -1662,8 +1515,7 @@
       password="telecable"
       type="default,supl"
   />
-  <apn
-      carrier="TeleCable MMS"
+  <apn carrier="TeleCable MMS"
       mcc="214"
       mnc="16"
       apn="mms.telecable.es"
@@ -1674,15 +1526,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="ONO Internet"
+    <apn carrier="ONO Internet"
       mcc="214"
       mnc="18"
       apn="internet.ono.com"
       type="default,supl"
   />
-  <apn
-      carrier="ONO MMS"
+  <apn carrier="ONO MMS"
       mcc="214"
       mnc="18"
       apn="mms.ono.com"
@@ -1691,8 +1541,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Simyo Internet"
+  <apn carrier="Simyo Internet"
       mcc="214"
       mnc="19"
       apn="gprs-service.com"
@@ -1701,15 +1550,13 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Jazztel Internet"
+  <apn carrier="Jazztel Internet"
       mcc="214"
       mnc="21"
       apn="jazzinternet"
       type="default,supl"
   />
-  <apn
-      carrier="Jazztel MMS"
+  <apn carrier="Jazztel MMS"
       mcc="214"
       mnc="21"
       apn="jazzmms"
@@ -1721,15 +1568,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="214"
       mnc="27"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+
+  <apn carrier="Telenor MMS"
       mcc="216"
       mnc="01"
       apn="mms"
@@ -1738,15 +1584,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telenor Online"
+  <apn carrier="Telenor Online"
       mcc="216"
       mnc="01"
       apn="online"
       type="default,supl"
   />
-  <apn
-      carrier="Djuice MMS"
+  <apn carrier="Djuice MMS"
       mcc="216"
       mnc="01"
       apn="mms"
@@ -1758,8 +1602,7 @@
       mvno_match_data="Djuice"
       mvno_type="spn"
   />
-  <apn
-      carrier="Djuice NET"
+  <apn carrier="Djuice NET"
       mcc="216"
       mnc="01"
       apn="net"
@@ -1768,8 +1611,7 @@
       mvno_match_data="Djuice"
       mvno_type="spn"
   />
-  <apn
-      carrier="Djuice WAP"
+  <apn carrier="Djuice WAP"
       mcc="216"
       mnc="01"
       apn="wap"
@@ -1780,8 +1622,7 @@
       mvno_match_data="Djuice"
       mvno_type="spn"
   />
-  <apn
-      carrier="Telekom HU NET"
+  <apn carrier="Telekom HU NET"
       mcc="216"
       mnc="30"
       apn="internet.telekom"
@@ -1790,8 +1631,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Telekom HU MMS"
+  <apn carrier="Telekom HU MMS"
       mcc="216"
       mnc="30"
       apn="internet.telekom"
@@ -1803,8 +1643,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="HOS"
+  <apn carrier="HOS"
       mcc="216"
       mnc="30"
       apn="hos"
@@ -1813,8 +1652,7 @@
       mmsport="8080"
       type="mms,supl"
   />
-  <apn
-      carrier="T-Mobile MMS"
+  <apn carrier="T-Mobile MMS"
       mcc="216"
       mnc="30"
       apn="mms"
@@ -1825,15 +1663,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone Internet"
+  <apn carrier="Vodafone Internet"
       mcc="216"
       mnc="70"
       apn="internet.vodafone.net"
       type="default,dun"
   />
-  <apn
-      carrier="Vodafone MMS"
+
+  <apn carrier="Vodafone MMS"
       mcc="216"
       mnc="70"
       apn="mms.vodafone.net"
@@ -1842,8 +1679,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone Live!"
+  <apn carrier="Vodafone Live!"
       mcc="216"
       mnc="70"
       apn="wap.vodafone.net"
@@ -1853,8 +1689,8 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="HT Eronet WAP"
+
+  <apn carrier="HT Eronet WAP"
       mcc="218"
       mnc="03"
       apn="wap.eronet.ba"
@@ -1862,15 +1698,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="HT Eronet GPRS"
+  <apn carrier="HT Eronet GPRS"
       mcc="218"
       mnc="03"
       apn="gprs.eronet.ba"
       type="default,supl"
   />
-  <apn
-      carrier="Ht Eronet MMS"
+  <apn carrier="Ht Eronet MMS"
       mcc="218"
       mnc="03"
       apn="mms.eronet.ba"
@@ -1879,8 +1713,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="m:tel"
+  <apn carrier="m:tel"
       mcc="218"
       mnc="05"
       apn="3g1"
@@ -1888,8 +1721,7 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="mtelmms"
+  <apn carrier="mtelmms"
       mcc="218"
       mnc="05"
       apn="mtelmms"
@@ -1898,15 +1730,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Bh Mobile"
+  <apn carrier="Bh Mobile"
       mcc="218"
       mnc="90"
       apn="active.bhmobile.ba"
       type="default,supl"
   />
-  <apn
-      carrier="BHMobileMMS"
+  <apn carrier="BHMobileMMS"
       mcc="218"
       mnc="90"
       apn="mms.bhmobile.ba"
@@ -1915,8 +1745,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile MMS"
+
+  <apn carrier="T-Mobile MMS"
       mcc="219"
       mnc="01"
       apn="mms.htgprs"
@@ -1925,23 +1755,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile"
+  <apn carrier="T-Mobile"
       mcc="219"
       mnc="01"
       apn="web.htgprs"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile Internet"
       mcc="219"
       mnc="01"
       apn="internet.ht.hr"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="bonbon Internet"
+  <apn carrier="bonbon Internet"
       mcc="219"
       mnc="01"
       apn="web.htgprs"
@@ -1950,8 +1777,7 @@
       mvno_type="spn"
       mvno_match_data="bonbon"
   />
-  <apn
-      carrier="bonbon MMS"
+  <apn carrier="bonbon MMS"
       mcc="219"
       mnc="01"
       apn="mms.htgprs"
@@ -1963,8 +1789,7 @@
       mvno_type="spn"
       mvno_match_data="bonbon"
   />
-  <apn
-      carrier="Tele2"
+  <apn carrier="Tele2"
       mcc="219"
       mnc="02"
       apn="internet.tele2.hr"
@@ -1973,8 +1798,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Broadband"
+  <apn carrier="Broadband"
       mcc="219"
       mnc="10"
       apn="data.vip.hr"
@@ -1982,8 +1806,7 @@
       password="38591"
       type="default,supl"
   />
-  <apn
-      carrier="VIP.mms"
+  <apn carrier="VIP.mms"
       mcc="219"
       mnc="10"
       apn="mms.vipnet.hr"
@@ -1994,8 +1817,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telenor WAP"
+
+  <apn carrier="Telenor WAP"
       mcc="220"
       mnc="01"
       apn="internet"
@@ -2005,8 +1828,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="220"
       mnc="01"
       apn="mms"
@@ -2015,8 +1837,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telenor MNE internet"
+  <apn carrier="Telenor MNE internet"
       mcc="220"
       mnc="02"
       apn="internet"
@@ -2026,8 +1847,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MNE mms"
+  <apn carrier="Telenor MNE mms"
       mcc="220"
       mnc="02"
       apn="mms"
@@ -2038,8 +1858,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="mt:s wap"
+  <apn carrier="mt:s wap"
       mcc="220"
       mnc="03"
       apn="gprswap"
@@ -2049,8 +1868,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="mt:s mms"
+  <apn carrier="mt:s mms"
       mcc="220"
       mnc="03"
       apn="mms"
@@ -2061,8 +1879,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile MMS"
+  <apn carrier="T-Mobile MMS"
       mcc="220"
       mnc="04"
       apn="mms"
@@ -2073,8 +1890,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile Internet"
       mcc="220"
       mnc="04"
       apn="tmcg-wnw"
@@ -2084,8 +1900,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vip GPRS"
+  <apn carrier="Vip GPRS"
       mcc="220"
       mnc="05"
       apn="vipmobile"
@@ -2095,8 +1910,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vip MMS"
+  <apn carrier="Vip MMS"
       mcc="220"
       mnc="05"
       apn="vipmobile.mms"
@@ -2107,8 +1921,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="WAP TIM"
+
+  <apn carrier="WAP TIM"
       mcc="222"
       mnc="01"
       apn="wap.tim.it"
@@ -2117,16 +1931,14 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="TIM WEB"
+  <apn carrier="TIM WEB"
       mcc="222"
       mnc="01"
       apn="ibox.tim.it"
       authtype="0"
       type="dun"
   />
-  <apn
-      carrier="iTIM"
+  <apn carrier="iTIM"
       mcc="222"
       mnc="01"
       apn="unico.tim.it"
@@ -2135,8 +1947,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="222"
       mnc="01"
       apn="internet.windmobile.ca"
@@ -2145,8 +1956,7 @@
       mvno_match_data="FFFFFF00"
       mvno_type="gid"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="222"
       mnc="01"
       apn="mms.windmobile.ca"
@@ -2157,8 +1967,7 @@
       mvno_match_data="FFFFFF00"
       mvno_type="gid"
   />
-  <apn
-      carrier="MMS"
+ <apn carrier="MMS"
       mcc="222"
       mnc="01"
       authtype="0"
@@ -2170,8 +1979,7 @@
       mvno_type="spn"
       mvno_match_data="IUSACELL"
   />
-  <apn
-      carrier="Modem"
+  <apn carrier="Modem"
       mcc="222"
       mnc="01"
       authtype="0"
@@ -2182,8 +1990,7 @@
       mvno_type="spn"
       mvno_match_data="IUSACELL"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="222"
       mnc="01"
       authtype="0"
@@ -2194,8 +2001,7 @@
       mvno_type="spn"
       mvno_match_data="IUSACELL"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="222"
       mnc="01"
       apn="mms.iusacellgsm.mx"
@@ -2207,8 +2013,7 @@
       mvno_type="spn"
       mvno_match_data="UNEFON"
   />
-  <apn
-      carrier="Modem"
+  <apn carrier="Modem"
       mcc="222"
       mnc="01"
       apn="modem.iusacellgsm.mx"
@@ -2219,8 +2024,7 @@
       mvno_type="spn"
       mvno_match_data="UNEFON"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="222"
       mnc="01"
       apn="web.iusacellgsm.mx"
@@ -2231,8 +2035,7 @@
       mvno_type="spn"
       mvno_match_data="UNEFON"
   />
-  <apn
-      carrier="NOVERCA MMS"
+  <apn carrier="NOVERCA MMS"
       mcc="222"
       mnc="01"
       apn="mms.noverca.it"
@@ -2244,8 +2047,7 @@
       mvno_type="spn"
       mvno_match_data="Noverca"
   />
-  <apn
-      carrier="NOVERCA WEB"
+  <apn carrier="NOVERCA WEB"
       mcc="222"
       mnc="01"
       apn="web.noverca.it"
@@ -2254,8 +2056,8 @@
       mvno_type="spn"
       mvno_match_data="Noverca"
   />
-  <apn
-      carrier="Jio 4G"
+
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="222"
       mnc="01"
@@ -2263,10 +2065,11 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       mvno_type="iccid"
-      mvno_match_data="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,                        8991870,8991871,8991872,8991873,8991874"
+      mvno_match_data="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,
+                       8991870,8991871,8991872,8991873,8991874"
   />
-  <apn
-      carrier="IMS"
+
+  <apn carrier="IMS"
       apn="ims"
       mcc="222"
       mnc="01"
@@ -2275,10 +2078,11 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
       mvno_type="iccid"
-      mvno_match_data="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,                        8991870,8991871,8991872,8991873,8991874"
+      mvno_match_data="8991840,8991854,8991855,8991856,8991857,8991858,8991859,899186,
+                       8991870,8991871,8991872,8991873,8991874"
   />
-  <apn
-      carrier="MMS Vodafone"
+
+  <apn carrier="MMS Vodafone"
       mcc="222"
       mnc="10"
       apn="mms.vodafone.it"
@@ -2287,22 +2091,19 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Accesso a Internet da cellulare"
+  <apn carrier="Accesso a Internet da cellulare"
       mcc="222"
       mnc="10"
       apn="mobile.vodafone.it"
       type="default,supl"
   />
-  <apn
-      carrier="Tethering Internet"
+  <apn carrier="Tethering Internet"
       mcc="222"
       mnc="10"
       apn="web.omnitel.it"
       type="dun"
   />
-  <apn
-      carrier="PosteMobile"
+  <apn carrier="PosteMobile"
       mcc="222"
       mnc="10"
       apn="wap.postemobile.it"
@@ -2311,8 +2112,7 @@
       mvno_type="spn"
       mvno_match_data="PosteMobile"
   />
-  <apn
-      carrier="PosteMobile (DUN)"
+  <apn carrier="PosteMobile (DUN)"
       mcc="222"
       mnc="10"
       apn="internet.postemobile.it"
@@ -2321,8 +2121,7 @@
       mvno_type="spn"
       mvno_match_data="PosteMobile"
   />
-  <apn
-      carrier="PosteMobile MMS"
+  <apn carrier="PosteMobile MMS"
       mcc="222"
       mnc="10"
       apn="mms.postemobile.it"
@@ -2334,8 +2133,7 @@
       mvno_type="spn"
       mvno_match_data="PosteMobile"
   />
-  <apn
-      carrier="ErgMobile WAP"
+  <apn carrier="ErgMobile WAP"
       mcc="222"
       mnc="10"
       apn="mobile.erg.it"
@@ -2344,15 +2142,14 @@
       mvno_type="spn"
       mvno_match_data="ERG"
   />
-  <apn
-      carrier="WIND WEB"
+  <apn carrier="WIND WEB"
       mcc="222"
       mnc="88"
-      apn="internet.wind"
-      type="default,supl"
+      apn="internet.it"
+      type="default"
+      protocol="IPV4V6"
   />
-  <apn
-      carrier="WIND MMS"
+  <apn carrier="WIND MMS"
       mcc="222"
       mnc="88"
       apn="mms.wind"
@@ -2361,15 +2158,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="WIND BIZ WEB"
+  <apn carrier="WIND XCAP"
+      mcc="222"
+      mnc="88"
+      apn="xcap"
+      type="supl"
+      protocol="IPV4V6"
+  />
+  <apn carrier="WIND BIZ WEB"
       mcc="222"
       mnc="88"
       apn="internet.wind.biz"
       type="default,supl"
   />
-  <apn
-      carrier="Internet"
+   <apn carrier="Internet"
       mcc="222"
       mnc="88"
       apn="internet.windmobile.ca"
@@ -2378,8 +2180,7 @@
       mvno_match_data="FFFFFF00"
       mvno_type="gid"
   />
-  <apn
-      carrier="MMS"
+   <apn carrier="MMS"
       mcc="222"
       mnc="88"
       apn="mms.windmobile.ca"
@@ -2390,8 +2191,7 @@
       mvno_match_data="FFFFFF00"
       mvno_type="gid"
   />
-  <apn
-      carrier="WIND MMS"
+  <apn carrier="WIND MMS"
       mcc="222"
       mnc="88"
       apn="mms.wind"
@@ -2400,8 +2200,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="222"
       mnc="99"
       apn="tre.it"
@@ -2410,8 +2209,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Fastweb WEB"
+  <apn carrier="Fastweb WEB"
       mcc="222"
       mnc="99"
       mvno_match_data="FASTWEB"
@@ -2422,22 +2220,22 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Internet"
+
+  <apn carrier="Internet"
       mcc="226"
       mnc="01"
       apn="internet.vodafone.ro"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Vodafone live!"
+
+  <apn carrier="Vodafone live!"
       mcc="226"
       mnc="01"
       apn="live.vodafone.com"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Vodafone live!PRE"
+
+  <apn carrier="Vodafone live!PRE"
       mcc="226"
       mnc="01"
       apn="live.pre.vodafone.com"
@@ -2447,8 +2245,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="226"
       mnc="01"
       apn="mms.vodafone.ro"
@@ -2459,8 +2256,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone MMS PRE"
+  <apn carrier="Vodafone MMS PRE"
       mcc="226"
       mnc="01"
       apn="mms.pre.vodafone.ro"
@@ -2471,15 +2267,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cosmote Internet"
+  <apn carrier="Cosmote Internet"
       mcc="226"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cosmote MMS"
+  <apn carrier="Cosmote MMS"
       mcc="226"
       mnc="03"
       apn="mms"
@@ -2490,8 +2284,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="web'n'walk"
+  <apn carrier="web'n'walk"
       mcc="226"
       mnc="03"
       apn="wnw"
@@ -2499,8 +2292,7 @@
       password="wnw"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="226"
       mnc="05"
       apn="mms"
@@ -2509,23 +2301,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Digi.Mobil"
+  <apn carrier="Digi.Mobil"
       mcc="226"
       mnc="05"
       apn="internet"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Cosmote Connect Mobile"
+  <apn carrier="Cosmote Connect Mobile"
       mcc="226"
       mnc="06"
       apn="broadband"
       type="default,supl"
   />
-  <apn
-      carrier="Cosmote MMS"
+  <apn carrier="Cosmote MMS"
       mcc="226"
       mnc="06"
       apn="mms"
@@ -2536,8 +2325,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="web'n'walk"
+  <apn carrier="web'n'walk"
       mcc="226"
       mnc="06"
       apn="wnw"
@@ -2547,8 +2335,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Orange RO IMS"
+  <apn carrier="Orange RO IMS"
       mcc="226"
       mnc="10"
       apn="ims"
@@ -2556,8 +2343,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="226"
       mnc="10"
       apn="mms"
@@ -2569,8 +2355,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Orange World"
+  <apn carrier="Orange World"
       mcc="226"
       mnc="10"
       apn="wap"
@@ -2583,16 +2368,15 @@
       bearer="2"
       bearer_bitmask="1"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="226"
       mnc="10"
       apn="net"
       type="default,ia"
       user_editable="0"
   />
-  <apn
-      carrier="Swisscom MMS"
+
+  <apn carrier="Swisscom MMS"
       mcc="228"
       mnc="01"
       apn="event.swisscom.ch"
@@ -2601,8 +2385,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Swisscom Services"
+  <apn carrier="Swisscom Services"
       mcc="228"
       mnc="01"
       apn="gprs.swisscom.ch"
@@ -2610,15 +2393,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Sunrise live"
+  <apn carrier="Sunrise live"
       mcc="228"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Sunrise MMS"
+  <apn carrier="Sunrise MMS"
       mcc="228"
       mnc="02"
       apn="mms.sunrise.ch"
@@ -2627,15 +2408,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="228"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="228"
       mnc="03"
       apn="mms"
@@ -2644,8 +2423,28 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile CZ"
+  <apn carrier="upcnet"
+      mcc="228"
+      mnc="53"
+      apn="internet.ch.upcmobile.com"
+      type="default"
+  />
+  <apn carrier="upcmms"
+      mcc="228"
+      mnc="53"
+      apn="mms.ch.upcmobile.com"
+      mmsc="http://mms.ch.upcmobile.com:8080/servlets/mms"
+      mmsproxy="62.179.127.18"
+      mmsport="8080"
+      type="mms"
+  />
+  <apn carrier="upchos"
+      mcc="228"
+      mnc="53"
+      apn="hos"
+      type="supl"
+  />
+  <apn carrier="T-Mobile CZ"
       mcc="230"
       mnc="01"
       apn="internet.t-mobile.cz"
@@ -2653,8 +2452,7 @@
       password="wap"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile MMS"
+  <apn carrier="T-Mobile MMS"
       mcc="230"
       mnc="01"
       apn="mms.t-mobile.cz"
@@ -2665,15 +2463,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="O2 internet"
+  <apn carrier="O2 internet"
       mcc="230"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="O2 MMS"
+  <apn carrier="O2 MMS"
       mcc="230"
       mnc="02"
       apn="mms"
@@ -2682,24 +2478,21 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone CZ"
-      mcc="230"
-      mnc="03"
-      apn="ims"
-      type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+  <apn carrier="Vodafone CZ"
+       mcc="230"
+       mnc="03"
+       apn="ims"
+       type="ims"
+       protocol="IPV4V6"
+       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="230"
       mnc="03"
       apn="internet"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="230"
       mnc="03"
       apn="mms"
@@ -2711,16 +2504,15 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Orange Internet"
+
+  <apn carrier="Orange Internet"
       mcc="231"
       mnc="01"
       apn="internet"
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="231"
       mnc="01"
       apn="mms"
@@ -2732,8 +2524,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Orange World"
+  <apn carrier="Orange World"
       mcc="231"
       mnc="01"
       apn="orangewap"
@@ -2744,15 +2535,13 @@
       type="default,supl,wap"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile internet"
+  <apn carrier="T-Mobile internet"
       mcc="231"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile MMS"
+  <apn carrier="T-Mobile MMS"
       mcc="231"
       mnc="02"
       apn="mms"
@@ -2763,15 +2552,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="O2 internet"
+  <apn carrier="O2 internet"
       mcc="231"
       mnc="06"
       apn="o2internet"
       type="default,supl"
   />
-  <apn
-      carrier="O2 MMS"
+  <apn carrier="O2 MMS"
       mcc="231"
       mnc="06"
       apn="o2mms"
@@ -2780,8 +2567,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="live!"
+
+  <apn carrier="live!"
       mcc="232"
       mnc="01"
       apn="a1.net"
@@ -2789,8 +2576,7 @@
       password="ppp"
       type="default,supl"
   />
-  <apn
-      carrier="aonMobil"
+  <apn carrier="aonMobil"
       mcc="232"
       mnc="01"
       apn="aon.at"
@@ -2798,8 +2584,7 @@
       password="ppp"
       type="default,supl"
   />
-  <apn
-      carrier="A1 MMS"
+  <apn carrier="A1 MMS"
       mcc="232"
       mnc="01"
       apn="free.a1.net"
@@ -2810,8 +2595,7 @@
       mmsport="8001"
       type="mms"
   />
-  <apn
-      carrier="aonMobil MMS"
+  <apn carrier="aonMobil MMS"
       mcc="232"
       mnc="01"
       apn="mms.aon.at"
@@ -2822,31 +2606,49 @@
       mmsport="8001"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile Internet"
       mcc="232"
       mnc="03"
       apn="internet.t-mobile.at"
       user="t-mobile"
       password="tm"
-      type="default,supl"
+      type="default"
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="T-Mobile MMS"
+  <apn carrier="HOS"
       mcc="232"
       mnc="03"
-      apn="gprsmms"
+      apn="hos"
       user="t-mobile"
       password="tm"
       mmsc="http://mmsc.t-mobile.at/servlets/mms"
       mmsproxy="10.12.0.20"
       mmsport="80"
-      type="mms"
+      type="supl,mms"
   />
-  <apn
-      carrier="Planet 3"
+  <apn carrier="T-Mobile Internet"
+      mcc="232"
+      mnc="07"
+      apn="internet.t-mobile.at"
+      user="T"
+      password="tm"
+      type="default"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
+  />
+  <apn carrier="HOS"
+      mcc="232"
+      mnc="07"
+      apn="hos"
+      user="t-mobile"
+      password="tm"
+      mmsc="http://mmsc.t-mobile.at/servlets/mms"
+      mmsproxy="10.12.0.20"
+      mmsport="80"
+      type="supl,mms"
+  />
+  <apn carrier="Planet 3"
       mcc="232"
       mnc="05"
       apn="drei.at"
@@ -2855,8 +2657,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Planet 3 ims"
+  <apn carrier="Planet 3 ims"
       carrier_id="1344"
       mcc="232"
       mnc="05"
@@ -2865,8 +2666,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="tele.ring mms"
+  <apn carrier="tele.ring mms"
       mcc="232"
       mnc="07"
       apn="mms"
@@ -2877,8 +2677,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="tele.ring web"
+  <apn carrier="tele.ring web"
       mcc="232"
       mnc="07"
       apn="web"
@@ -2886,8 +2685,7 @@
       password="web"
       type="default,supl"
   />
-  <apn
-      carrier="Planet3"
+  <apn carrier="Planet3"
       mcc="232"
       mnc="10"
       apn="drei.at"
@@ -2896,8 +2694,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="data.bob"
+  <apn carrier="data.bob"
       mcc="232"
       mnc="11"
       apn="bob.at"
@@ -2905,8 +2702,7 @@
       password="ppp"
       type="default,supl"
   />
-  <apn
-      carrier="data.bob MMS"
+  <apn carrier="data.bob MMS"
       mcc="232"
       mnc="11"
       apn="mms.bob.at"
@@ -2917,22 +2713,20 @@
       mmsport="8001"
       type="mms"
   />
-  <apn
-      carrier="YESSS! GPRS"
+  <apn carrier="YESSS! GPRS"
       mcc="232"
       mnc="12"
       apn="web.yesss.at"
       type="default,supl"
   />
-  <apn
-      carrier="UBIQUISYS"
+
+  <apn carrier="UBIQUISYS"
       mcc="234"
       mnc="01"
       apn="internet"
       type="default,supl,mms"
   />
-  <apn
-      carrier="O2 MOBILE WEB"
+  <apn carrier="O2 MOBILE WEB"
       mcc="234"
       mnc="02"
       apn="mobile.o2.co.uk"
@@ -2940,8 +2734,7 @@
       password="O2web"
       type="default,supl"
   />
-  <apn
-      carrier="O2 MMS Prepay"
+  <apn carrier="O2 MMS Prepay"
       mcc="234"
       mnc="02"
       apn="payandgo.o2.co.uk"
@@ -2952,8 +2745,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="O2 MMS Postpay"
+  <apn carrier="O2 MMS Postpay"
       mcc="234"
       mnc="02"
       apn="wap.o2.co.uk"
@@ -2964,8 +2756,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="BT One Phone Internet"
+  <apn carrier="BT One Phone Internet"
       mcc="234"
       mnc="08"
       apn="internet.btonephone.com"
@@ -2973,8 +2764,7 @@
       mvno_match_data="B2"
       type="default,supl"
   />
-  <apn
-      carrier="BT One Phone MMS"
+  <apn carrier="BT One Phone MMS"
       mcc="234"
       mnc="08"
       apn="mms.btonephone.com"
@@ -2985,8 +2775,7 @@
       mvno_match_data="B2"
       type="mms"
   />
-  <apn
-      carrier="O2 Mobile Web"
+  <apn carrier="O2 Mobile Web"
       mcc="234"
       mnc="10"
       apn="mobile.o2.co.uk"
@@ -2994,8 +2783,7 @@
       password="password"
       type="default,supl"
   />
-  <apn
-      carrier="O2 MMS"
+  <apn carrier="O2 MMS"
       mcc="234"
       mnc="10"
       apn="wap.o2.co.uk"
@@ -3008,8 +2796,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="O2 PREPAY"
+  <apn carrier="O2 PREPAY"
       mcc="234"
       mnc="10"
       apn="payandgo.o2.co.uk"
@@ -3022,8 +2809,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="TESCO"
+ <apn carrier="TESCO"
       mcc="234"
       mnc="10"
       apn="prepay.tesco-mobile.com"
@@ -3036,8 +2822,7 @@
       mvno_match_data="0A"
       mvno_type="gid"
   />
-  <apn
-      carrier="giffgaff"
+  <apn carrier="giffgaff"
       mcc="234"
       mnc="10"
       apn="giffgaff.com"
@@ -3050,8 +2835,7 @@
       mvno_type="spn"
       mvno_match_data="giffgaff"
   />
-  <apn
-      carrier="O2 MOBILE WEB"
+  <apn carrier="O2 MOBILE WEB"
       mcc="234"
       mnc="11"
       apn="mobile.o2.co.uk"
@@ -3059,8 +2843,7 @@
       password="O2web"
       type="default,supl"
   />
-  <apn
-      carrier="O2 MMS Prepay"
+  <apn carrier="O2 MMS Prepay"
       mcc="234"
       mnc="11"
       apn="payandgo.o2.co.uk"
@@ -3071,8 +2854,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="O2 MMS Postpay"
+  <apn carrier="O2 MMS Postpay"
       mcc="234"
       mnc="11"
       apn="wap.o2.co.uk"
@@ -3083,8 +2865,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="O2 MOBILE WEB"
+  <apn carrier="O2 MOBILE WEB"
       mcc="234"
       mnc="11"
       apn="mobile.o2.co.uk"
@@ -3092,8 +2873,7 @@
       password="O2web"
       type="default,supl"
   />
-  <apn
-      carrier="O2 MMS Prepay"
+  <apn carrier="O2 MMS Prepay"
       mcc="234"
       mnc="11"
       apn="payandgo.o2.co.uk"
@@ -3104,8 +2884,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="O2 MMS Postpay"
+  <apn carrier="O2 MMS Postpay"
       mcc="234"
       mnc="11"
       apn="wap.o2.co.uk"
@@ -3116,8 +2895,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone UK IMS"
+  <apn carrier="Vodafone UK IMS"
       mcc="234"
       mnc="15"
       apn="ims"
@@ -3126,8 +2904,7 @@
       roaming_protocol="IPV4V6"
       user_visible="0"
   />
-  <apn
-      carrier="Pay Monthly Data"
+  <apn carrier="Pay Monthly Data"
       mcc="234"
       mnc="15"
       apn="wap.vodafone.co.uk"
@@ -3140,8 +2917,7 @@
       mmsproxy="212.183.137.12"
       mmsport="8799"
   />
-  <apn
-      carrier="Pay as You Go/VOXI Data"
+  <apn carrier="Pay as You Go/VOXI Data"
       mcc="234"
       mnc="15"
       apn="pp.vodafone.co.uk"
@@ -3154,8 +2930,7 @@
       mmsproxy="212.183.137.12"
       mmsport="8799"
   />
-  <apn
-      carrier="ASDA WAP"
+  <apn carrier="ASDA WAP"
       mcc="234"
       mnc="15"
       apn="asdamobiles.co.uk"
@@ -3171,8 +2946,7 @@
       mvno_match_data="A0"
       mvno_type="gid"
   />
-  <apn
-      carrier="Talkmob PAYG WAP"
+  <apn carrier="Talkmob PAYG WAP"
       mcc="234"
       mnc="15"
       apn="payg.talkmobile.co.uk"
@@ -3188,8 +2962,7 @@
       mvno_match_data="C1"
       mvno_type="gid"
   />
-  <apn
-      carrier="Talkmob WAP"
+  <apn carrier="Talkmob WAP"
       mcc="234"
       mnc="15"
       apn="talkmobile.co.uk"
@@ -3205,8 +2978,7 @@
       mvno_match_data="C1"
       mvno_type="gid"
   />
-  <apn
-      carrier="TalkTalk WAP"
+  <apn carrier="TalkTalk WAP"
       mcc="234"
       mnc="15"
       apn="mobile.talktalk.co.uk"
@@ -3217,8 +2989,7 @@
       mvno_match_data="70"
       mvno_type="gid"
   />
-  <apn
-      carrier="BT Mobile"
+  <apn carrier="BT Mobile"
       mcc="234"
       mnc="15"
       apn="btmobile.bt.com"
@@ -3231,8 +3002,7 @@
       mvno_type="gid"
       mvno_match_data="B3"
   />
-  <apn
-      carrier="Sainsbury's PAYG"
+  <apn carrier="Sainsbury's PAYG"
       mcc="234"
       mnc="15"
       apn="payg.mobilebysainsburys.co.uk"
@@ -3243,8 +3013,7 @@
       mvno_type="spn"
       mvno_match_data="Sainsbury's"
   />
-  <apn
-      carrier="Lebara Internet"
+  <apn carrier="Lebara Internet"
       mcc="234"
       mnc="15"
       apn="uk.lebara.mobi"
@@ -3258,8 +3027,7 @@
       mvno_match_data="Lebara"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3 IMS"
+  <apn carrier="3 IMS"
       mcc="234"
       mnc="20"
       apn="ims"
@@ -3267,8 +3035,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="234"
       mnc="20"
       apn="three.co.uk"
@@ -3279,8 +3046,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="3hotspot"
+  <apn carrier="3hotspot"
       mcc="234"
       mnc="20"
       apn="3hotspot"
@@ -3288,15 +3054,13 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="234"
       mnc="25"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="Lycamobile"
+  <apn carrier="Lycamobile"
       mcc="234"
       mnc="26"
       apn="data.lycamobile.co.uk"
@@ -3306,8 +3070,7 @@
       mvno_type="spn"
       mvno_match_data="Lycamobile"
   />
-  <apn
-      carrier="EE IMS"
+  <apn carrier="EE IMS"
       mcc="234"
       mnc="30"
       apn="ims"
@@ -3315,17 +3078,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="T-Mobile UK"
-      mcc="234"
-      mnc="30"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      type="default,supl"
-  />
-  <apn
-      carrier="Virgin Media Mobile Internet"
+  <apn carrier="Virgin Media Mobile Internet"
       mcc="234"
       mnc="30"
       mvno_match_data="28"
@@ -3337,8 +3090,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="234"
       mnc="30"
       apn="everywhere"
@@ -3350,8 +3102,7 @@
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="234"
       mnc="30"
       apn="eezone"
@@ -3366,8 +3117,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="BT One Phone Internet"
+  <apn carrier="BT One Phone Internet"
       mcc="234"
       mnc="30"
       apn="internet.btonephone.com"
@@ -3375,8 +3125,7 @@
       mvno_match_data="B2"
       type="default,supl"
   />
-  <apn
-      carrier="BT One Phone MMS"
+  <apn carrier="BT One Phone MMS"
       mcc="234"
       mnc="30"
       apn="mms.btonephone.com"
@@ -3387,8 +3136,7 @@
       mvno_match_data="B2"
       type="mms"
   />
-  <apn
-      carrier="BT Internet"
+  <apn carrier="BT Internet"
       mcc="234"
       mnc="30"
       apn="btmobile.bt.com"
@@ -3399,8 +3147,7 @@
       mvno_match_data="B3"
       type="default,supl"
   />
-  <apn
-      carrier="BT MMS"
+  <apn carrier="BT MMS"
       mcc="234"
       mnc="30"
       apn="mms.bt.com"
@@ -3414,8 +3161,7 @@
       mvno_match_data="B3"
       type="mms"
   />
-  <apn
-      carrier="BT Internet"
+  <apn carrier="BT Internet"
       mcc="234"
       mnc="30"
       apn="btmobile.bt.com"
@@ -3426,8 +3172,7 @@
       mvno_match_data="C3"
       type="default,supl"
   />
-  <apn
-      carrier="BT MMS"
+  <apn carrier="BT MMS"
       mcc="234"
       mnc="30"
       apn="mms.bt.com"
@@ -3441,8 +3186,7 @@
       mvno_match_data="C3"
       type="mms"
   />
-  <apn
-      carrier="EE Internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="31"
       apn="everywhere"
@@ -3451,17 +3195,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile Internet"
-      mcc="234"
-      mnc="31"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      type="default,supl"
-  />
-  <apn
-      carrier="EE MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="31"
       apn="eezone"
@@ -3473,41 +3207,28 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile Picture Message"
-      mcc="234"
-      mnc="31"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
-      mmsproxy="149.254.201.135"
-      mmsport="8080"
-      type="mms"
-  />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="32"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
+      apn="everywhere"
+      user="eesecure"
+      password="secure"
+      authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile Picture Message"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="32"
-      apn="general.t-mobile.uk"
-      user="t-mobile"
-      password="tm"
-      mmsc="http://mmsc.t-mobile.co.uk:8002"
+      apn="eezone"
+      user="eesecure"
+      password="secure"
+      mmsc="http://mms/"
       mmsproxy="149.254.201.135"
       mmsport="8080"
+      authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="234"
       mnc="33"
       apn="everywhere"
@@ -3519,8 +3240,7 @@
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="234"
       mnc="33"
       apn="eezone"
@@ -3535,8 +3255,7 @@
       roaming_protocol="IP"
       user_editable="0"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="234"
       mnc="33"
       apn="tslpaygnet"
@@ -3545,16 +3264,14 @@
       mvno_type="spn"
       mvno_match_data="LIFE"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="234"
       mnc="33"
       apn="orangeinternet"
       authtype="2"
       type="default"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="234"
       mnc="33"
       apn="tslmms"
@@ -3568,8 +3285,7 @@
       mvno_type="spn"
       mvno_match_data="LIFE"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="234"
       mnc="33"
       apn="orangemms"
@@ -3579,8 +3295,7 @@
       authtype="2"
       type="mms"
   />
-  <apn
-      carrier="EE Internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="34"
       apn="everywhere"
@@ -3589,15 +3304,13 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Orange internet"
+  <apn carrier="Orange internet"
       mcc="234"
       mnc="34"
       apn="orangeinternet"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="234"
       mnc="34"
       apn="orangemms"
@@ -3606,8 +3319,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="EE MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="34"
       apn="eezone"
@@ -3619,8 +3331,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Jersey Telecom"
+  <apn carrier="Jersey Telecom"
       mcc="234"
       mnc="50"
       apn="mms"
@@ -3631,22 +3342,19 @@
       mmsport="3130"
       type="mms"
   />
-  <apn
-      carrier="pepperWEB (Jersey)"
+  <apn carrier="pepperWEB (Jersey)"
       mcc="234"
       mnc="50"
       apn="pepper"
       type="default,supl"
   />
-  <apn
-      carrier="C&amp;W Guernsey Internet"
+  <apn carrier="C&amp;W Guernsey Internet"
       mcc="234"
       mnc="55"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Sure Picture Messaging"
+  <apn carrier="Sure Picture Messaging"
       mcc="234"
       mnc="55"
       apn="mms"
@@ -3655,15 +3363,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="3G HSDPA"
+  <apn carrier="3G HSDPA"
       mcc="234"
       mnc="58"
       apn="3gpronto"
       type="default,supl"
   />
-  <apn
-      carrier="Manx Telecom Contract MMS"
+  <apn carrier="Manx Telecom Contract MMS"
       mcc="234"
       mnc="58"
       apn="mms.manxpronto.net"
@@ -3674,8 +3380,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Manx Telecom Prepay MMS"
+  <apn carrier="Manx Telecom Prepay MMS"
       mcc="234"
       mnc="58"
       apn="mms.prontogo.net"
@@ -3686,8 +3391,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Manx Telecom Contract WEB"
+  <apn carrier="Manx Telecom Contract WEB"
       mcc="234"
       mnc="58"
       apn="web.manxpronto.net"
@@ -3695,15 +3399,13 @@
       password="gprs"
       type="default,supl"
   />
-  <apn
-      carrier="Orange internet"
+  <apn carrier="Orange internet"
       mcc="234"
       mnc="86"
       apn="orangeinternet"
       type="default,supl"
   />
-  <apn
-      carrier="EE Internet"
+  <apn carrier="EE Internet"
       mcc="234"
       mnc="86"
       apn="everywhere"
@@ -3712,8 +3414,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="EE MMS"
+  <apn carrier="EE MMS"
       mcc="234"
       mnc="86"
       apn="eezone"
@@ -3725,8 +3426,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="234"
       mnc="86"
       apn="orangemms"
@@ -3735,8 +3435,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="3"
+
+  <apn carrier="3"
       mcc="235"
       mnc="94"
       apn="three.co.uk"
@@ -3745,16 +3445,15 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="DK TDC"
+
+  <apn carrier="DK TDC"
       mcc="238"
       mnc="01"
       apn="internet"
       authtype="0"
       type="default,supl,agps,fota,dun"
   />
-  <apn
-      carrier="DK TDC mms"
+  <apn carrier="DK TDC mms"
       mcc="238"
       mnc="01"
       apn="mms"
@@ -3764,8 +3463,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="TDC Internet"
+  <apn carrier="TDC Internet"
       mcc="238"
       mnc="01"
       mvno_match_data="2380101xxxxxxxx"
@@ -3773,8 +3471,7 @@
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="TDC MMS"
+  <apn carrier="TDC MMS"
       mcc="238"
       mnc="01"
       mvno_match_data="2380101xxxxxxxx"
@@ -3785,8 +3482,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telmore Internet"
+  <apn carrier="Telmore Internet"
       mcc="238"
       mnc="01"
       apn="internet"
@@ -3794,8 +3490,7 @@
       mvno_type="spn"
       mvno_match_data="TELMORE"
   />
-  <apn
-      carrier="Telmore MMS"
+  <apn carrier="Telmore MMS"
       mcc="238"
       mnc="01"
       apn="mms"
@@ -3806,8 +3501,7 @@
       mvno_type="spn"
       mvno_match_data="TELMORE"
   />
-  <apn
-      carrier="TELMORE WAP"
+  <apn carrier="TELMORE WAP"
       mcc="238"
       mnc="01"
       apn="wap"
@@ -3818,15 +3512,13 @@
       mvno_type="spn"
       mvno_match_data="TELMORE"
   />
-  <apn
-      carrier="Telenor Internet"
+  <apn carrier="Telenor Internet"
       mcc="238"
       mnc="02"
       apn="Internet"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="238"
       mnc="02"
       apn="telenor"
@@ -3835,8 +3527,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="238"
       mnc="06"
       apn="data.tre.dk"
@@ -3845,8 +3536,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Telia SurfPort"
+  <apn carrier="Telia SurfPort"
       mcc="238"
       mnc="20"
       apn="www.internet.mtelia.dk"
@@ -3854,8 +3544,7 @@
       mvno_type="imsi"
       mvno_match_data="2382010x"
   />
-  <apn
-      carrier="Telia SurfPort"
+  <apn carrier="Telia SurfPort"
       mcc="238"
       mnc="20"
       mvno_type="imsi"
@@ -3863,8 +3552,7 @@
       apn="www.internet.mtelia.dk"
       type="default,supl"
   />
-  <apn
-      carrier="Telia MMS"
+  <apn carrier="Telia MMS"
       mcc="238"
       mnc="20"
       apn="www.mms.mtelia.dk"
@@ -3875,8 +3563,7 @@
       mvno_type="imsi"
       mvno_match_data="2382010x"
   />
-  <apn
-      carrier="Telia MMS"
+  <apn carrier="Telia MMS"
       mcc="238"
       mnc="20"
       mvno_type="imsi"
@@ -3887,8 +3574,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Call me Internet"
+  <apn carrier="Call me Internet"
       mcc="238"
       mnc="20"
       apn="webSP"
@@ -3896,8 +3582,7 @@
       mvno_type="spn"
       mvno_match_data="Call me"
   />
-  <apn
-      carrier="Call me MMS"
+  <apn carrier="Call me MMS"
       mcc="238"
       mnc="20"
       apn="mmsSP"
@@ -3908,8 +3593,7 @@
       mvno_type="spn"
       mvno_match_data="Call me"
   />
-  <apn
-      carrier="DLG Tele GPRS"
+  <apn carrier="DLG Tele GPRS"
       mcc="238"
       mnc="20"
       apn="webSP"
@@ -3917,8 +3601,7 @@
       mvno_type="spn"
       mvno_match_data="DLG Tele"
   />
-  <apn
-      carrier="DLG Tele MMS"
+  <apn carrier="DLG Tele MMS"
       mcc="238"
       mnc="20"
       apn="mmsSP"
@@ -3929,23 +3612,20 @@
       mvno_type="spn"
       mvno_match_data="DLG Tele"
   />
-  <apn
-      carrier="Orange DE"
+  <apn carrier="Orange DE"
       mcc="238"
       mnc="30"
       apn="web.orange.dk"
       user=""
       password=""
   />
-  <apn
-      carrier="Telenor Internet"
+  <apn carrier="Telenor Internet"
       mcc="238"
       mnc="77"
       apn="Internet"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="238"
       mnc="77"
       apn="telenor"
@@ -3954,8 +3634,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telia SE MMS"
+
+  <apn carrier="Telia SE MMS"
       mcc="240"
       mnc="01"
       apn="mms.telia.se"
@@ -3964,15 +3644,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Telia"
+  <apn carrier="Telia"
       mcc="240"
       mnc="01"
       apn="online.telia.se"
       type="default,supl"
   />
-  <apn
-      carrier="Halebop Internet"
+  <apn carrier="Halebop Internet"
       mcc="240"
       mnc="01"
       apn="halebop.telia.se"
@@ -3980,8 +3658,7 @@
       mvno_match_data="240017xxxxxxxxx"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Halebop MMS"
+  <apn carrier="Halebop MMS"
       mcc="240"
       mnc="01"
       apn="mms.telia.se"
@@ -3992,8 +3669,7 @@
       mvno_match_data="240017xxxxxxxxx"
       mvno_type="imsi"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="240"
       mnc="02"
       apn="data.tre.se"
@@ -4002,8 +3678,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="240"
       mnc="04"
       apn="data.tre.se"
@@ -4012,8 +3687,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Telenor SE"
+  <apn carrier="Telenor SE"
       mcc="240"
       mnc="04"
       apn="services.telenor.se"
@@ -4024,29 +3698,19 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="3"
       mcc="240"
-      mnc="05"
-      apn="4g.tele2.se"
-      type="default,supl"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
+      mnc="04"
+      apn="services"
+      mmsc="http://mms.tre.se"
+      mmsproxy="mmsproxy.tre.se"
+      mmsport="8799"
+      type="supl,mms"
+      bearer_bitmask="18"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Tele2 MMS"
-      mcc="240"
-      mnc="05"
-      apn="4g.tele2.se"
-      mmsc="http://mmsc.tele2.se"
-      mmsproxy="130.244.202.30"
-      mmsport="8080"
-      type="mms"
-      mvno_match_data="Tele2"
-      mvno_type="spn"
-  />
-  <apn
-      carrier="Tele2 Internet 3G"
+  <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="05"
       apn="internet.tele2.se"
@@ -4054,8 +3718,7 @@
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
-  <apn
-      carrier="Tele2 MMS 3G"
+  <apn carrier="Tele2 MMS"
       mcc="240"
       mnc="05"
       apn="internet.tele2.se"
@@ -4066,8 +3729,7 @@
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
-  <apn
-      carrier="Telia MMS"
+  <apn carrier="Telia MMS"
       mcc="240"
       mnc="05"
       apn="mms.telia.se"
@@ -4078,8 +3740,7 @@
       mvno_match_data="Telia"
       mvno_type="spn"
   />
-  <apn
-      carrier="Telia"
+  <apn carrier="Telia"
       mcc="240"
       mnc="05"
       apn="online.telia.se"
@@ -4087,8 +3748,7 @@
       mvno_match_data="Telia"
       mvno_type="spn"
   />
-  <apn
-      carrier="Halebop Internet"
+  <apn carrier="Halebop Internet"
       mcc="240"
       mnc="05"
       apn="halebop.telia.se"
@@ -4096,8 +3756,7 @@
       mvno_match_data="Halebop"
       mvno_type="spn"
   />
-  <apn
-      carrier="Halebop MMS"
+  <apn carrier="Halebop MMS"
       mcc="240"
       mnc="05"
       apn="mms.telia.se"
@@ -4108,8 +3767,7 @@
       mvno_match_data="Halebop"
       mvno_type="spn"
   />
-  <apn
-      carrier="Telenor Mobilsurf"
+  <apn carrier="Telenor Mobilsurf"
       mcc="240"
       mnc="06"
       apn="services.telenor.se"
@@ -4117,8 +3775,7 @@
       port="8799"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="240"
       mnc="06"
       apn="services.telenor.se"
@@ -4127,15 +3784,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="07"
       apn="4g.tele2.se"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 MMS"
+  <apn carrier="Tele2 MMS"
       mcc="240"
       mnc="07"
       apn="4g.tele2.se"
@@ -4144,15 +3799,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="07"
       apn="4g.tele2.se"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 MMS"
+  <apn carrier="Tele2 MMS"
       mcc="240"
       mnc="07"
       apn="4g.tele2.se"
@@ -4161,15 +3814,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Tele2 Internet 3G"
+  <apn carrier="Tele2 Internet 3G"
       mcc="240"
       mnc="07"
       apn="internet.tele2.se"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 MMS 3G"
+  <apn carrier="Tele2 MMS 3G"
       mcc="240"
       mnc="07"
       apn="internet.tele2.se"
@@ -4178,8 +3829,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="07"
       apn="internet.tele2.no"
@@ -4190,8 +3840,7 @@
       mvno_match_data="2400768xxxxxxxx"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Tele2 MMS"
+  <apn carrier="Tele2 MMS"
       mcc="240"
       mnc="07"
       apn="internet.tele2.no"
@@ -4202,23 +3851,20 @@
       mvno_match_data="2400768xxxxxxxx"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Telenor Mobilsurf"
+  <apn carrier="Telenor Mobilsurf"
       mcc="240"
       mnc="08"
       apn="services.telenor.se"
       type="default"
   />
-  <apn
-      carrier="HOS"
+  <apn carrier="HOS"
       carrier_id="1695"
       mcc="240"
       mnc="08"
       apn="hos"
       type="supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="240"
       mnc="08"
       apn="mms"
@@ -4227,8 +3873,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TelenorMobilsurf"
+  <apn carrier="TelenorMobilsurf"
       mcc="240"
       mnc="09"
       apn="services.telenor.se"
@@ -4236,8 +3881,7 @@
       port="8799"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="240"
       mnc="09"
       apn="services.telenor.se"
@@ -4246,8 +3890,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TelenorMobilsurf"
+  <apn carrier="TelenorMobilsurf"
       mcc="240"
       mnc="09"
       apn="services.telenor.se"
@@ -4255,15 +3898,13 @@
       port="8799"
       type="default,supl"
   />
-  <apn
-      carrier="Spring data"
+  <apn carrier="Spring data"
       mcc="240"
       mnc="10"
       apn="data.springmobil.se"
       type="default,supl"
   />
-  <apn
-      carrier="Spring MMS"
+  <apn carrier="Spring MMS"
       mcc="240"
       mnc="10"
       apn="mms.springmobil.se"
@@ -4272,15 +3913,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Halebop Internet"
+  <apn carrier="Halebop Internet"
       mcc="240"
       mnc="017"
       apn="halebop.telia.se"
       type="default,supl"
   />
-  <apn
-      carrier="Halebop MMS"
+  <apn carrier="Halebop MMS"
       mcc="240"
       mnc="017"
       apn="mms.telia.se"
@@ -4291,8 +3930,7 @@
       mmsport="9201"
       type="mms"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="240"
       mnc="24"
       apn="4g.tele2.se"
@@ -4300,8 +3938,7 @@
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
-  <apn
-      carrier="Tele2 MMS"
+  <apn carrier="Tele2 MMS"
       mcc="240"
       mnc="24"
       apn="4g.tele2.se"
@@ -4312,8 +3949,7 @@
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
-  <apn
-      carrier="Tele2 Internet 3G"
+  <apn carrier="Tele2 Internet 3G"
       mcc="240"
       mnc="24"
       apn="internet.tele2.se"
@@ -4321,8 +3957,7 @@
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
-  <apn
-      carrier="Tele2 MMS 3G"
+  <apn carrier="Tele2 MMS 3G"
       mcc="240"
       mnc="24"
       apn="internet.tele2.se"
@@ -4333,8 +3968,7 @@
       mvno_match_data="Tele2"
       mvno_type="spn"
   />
-  <apn
-      carrier="Telenor SE"
+  <apn carrier="Telenor SE"
       mcc="240"
       mnc="24"
       apn="services.telenor.se"
@@ -4345,8 +3979,8 @@
       mvno_match_data="Telenor SE"
       mvno_type="spn"
   />
-  <apn
-      carrier="Ventelo Internett"
+
+  <apn carrier="Ventelo Internett"
       mcc="242"
       mnc="01"
       mvno_match_data="24201700xxxxxxx"
@@ -4354,8 +3988,7 @@
       apn="internet.ventelo.no"
       type="default,supl"
   />
-  <apn
-      carrier="Ventelo MMS"
+  <apn carrier="Ventelo MMS"
       mcc="242"
       mnc="01"
       mvno_match_data="24201700xxxxxxx"
@@ -4368,25 +4001,40 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telenor"
+  <apn carrier="Telenor Smart"
       mcc="242"
       mnc="01"
-      apn="telenor"
-      mmsc="http://mmsc"
-      mmsproxy="10.10.10.11"
-      mmsport="8080"
-      type="default,supl,mms"
+      apn="telenor.smart"
+      type="default"
+      protocol="IPV4V6"
+      roaming_protocol="IP"
   />
-  <apn
-      carrier="Telia"
+  <apn carrier="Telenor MMS"
+      mcc="242"
+      mnc="01"
+      apn="telenor.mms"
+      type="mms"
+      mmsproxy="mms-proxy.telenor.no"
+      mmsport="8080"
+      mmsc="http://mmsc/"
+      protocol="IP"
+      roaming_protocol="IP"
+  />
+  <apn carrier="HOS"
+      mcc="242"
+      mnc="01"
+      apn="hos"
+      type="supl"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
+  />
+  <apn carrier="Telia"
       mcc="242"
       mnc="02"
       apn="telia"
       type="default"
   />
-  <apn
-      carrier="Telia MMS"
+  <apn carrier="Telia MMS"
       mcc="242"
       mnc="02"
       apn="mms"
@@ -4400,8 +4048,7 @@
       mvno_match_data="2420256xxxxxxxx"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Telia IMS"
+  <apn carrier="Telia IMS"
       mcc="242"
       mnc="02"
       apn="ims"
@@ -4409,8 +4056,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="242"
       mnc="04"
       apn="internet.tele2.no"
@@ -4419,15 +4065,13 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="NwN Internet"
+  <apn carrier="NwN Internet"
       mcc="242"
       mnc="05"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="NwN MMS"
+  <apn carrier="NwN MMS"
       mcc="242"
       mnc="05"
       apn="mms"
@@ -4436,15 +4080,14 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="DNA Internet"
+
+  <apn carrier="DNA Internet"
       mcc="244"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="DNA MMS"
+  <apn carrier="DNA MMS"
       mcc="244"
       mnc="03"
       apn="mms"
@@ -4453,15 +4096,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="DNA Internet"
+  <apn carrier="DNA Internet"
       mcc="244"
       mnc="04"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="DNA MMS"
+  <apn carrier="DNA MMS"
       mcc="244"
       mnc="04"
       apn="mms"
@@ -4472,15 +4113,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Elisa Internet"
+  <apn carrier="Elisa Internet"
       mcc="244"
       mnc="05"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Elisa MMS"
+  <apn carrier="Elisa MMS"
       mcc="244"
       mnc="05"
       apn="mms"
@@ -4489,8 +4128,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Saunalahti Internet"
+  <apn carrier="Saunalahti Internet"
       mcc="244"
       mnc="05"
       apn="internet.saunalahti"
@@ -4498,8 +4136,7 @@
       mvno_match_data="2440541"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Saunalahti MMS"
+  <apn carrier="Saunalahti MMS"
       mcc="244"
       mnc="05"
       apn="mms.saunalahti.fi"
@@ -4510,8 +4147,7 @@
       mvno_match_data="2440541"
       mvno_type="imsi"
   />
-  <apn
-      carrier="TDC Internet"
+  <apn carrier="TDC Internet"
       mcc="244"
       mnc="10"
       apn="internet.song.fi"
@@ -4519,8 +4155,7 @@
       password="songnet"
       type="default,supl"
   />
-  <apn
-      carrier="TDC MMS"
+  <apn carrier="TDC MMS"
       mcc="244"
       mnc="10"
       apn="mms.song.fi"
@@ -4529,15 +4164,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="DNA Internet"
+  <apn carrier="DNA Internet"
       mcc="244"
       mnc="12"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="DNA MMS"
+  <apn carrier="DNA MMS"
       mcc="244"
       mnc="12"
       apn="mms"
@@ -4546,16 +4179,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="DNA Pro Internet"
+  <apn carrier="DNA Pro Internet"
       mcc="244"
       mnc="12"
       apn="dnapro.fi"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="DNA Pro MMS"
+  <apn carrier="DNA Pro MMS"
       mcc="244"
       mnc="12"
       apn="mms.dnapro.fi"
@@ -4565,15 +4196,13 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="DNA Internet"
+  <apn carrier="DNA Internet"
       mcc="244"
       mnc="13"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="DNA MMS"
+  <apn carrier="DNA MMS"
       mcc="244"
       mnc="13"
       apn="mms"
@@ -4584,15 +4213,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Saunalahti Internet"
+  <apn carrier="Saunalahti Internet"
       mcc="244"
       mnc="21"
       apn="internet.saunalahti"
       type="default,supl"
   />
-  <apn
-      carrier="Saunalahti MMS"
+  <apn carrier="Saunalahti MMS"
       mcc="244"
       mnc="21"
       apn="mms.saunalahti.fi"
@@ -4601,25 +4228,24 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SONERA Internet"
+  <apn carrier="SONERA Internet"
       mcc="244"
       mnc="91"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="SONERA MMS"
+  <apn carrier="SONERA MMS"
       mcc="244"
       mnc="91"
-      apn="wap.sonera.net"
-      mmsc="http://mms.sonera.fi:8002"
+      apn="mms"
+      mmsc="http://mms/"
       mmsproxy="195.156.25.33"
       mmsport="80"
       type="mms"
+      protocol="IPV4V6"
   />
-  <apn
-      carrier="Omnitel MMS"
+
+  <apn carrier="Omnitel MMS"
       mcc="246"
       mnc="01"
       apn="gprs.mms.lt"
@@ -4630,8 +4256,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Omnitel Internet"
+  <apn carrier="Omnitel Internet"
       mcc="246"
       mnc="01"
       apn="omnitel"
@@ -4639,8 +4264,7 @@
       password="omni"
       type="default,supl"
   />
-  <apn
-      carrier="Bite LT Internet"
+  <apn carrier="Bite LT Internet"
       mcc="246"
       mnc="02"
       apn="internet"
@@ -4651,8 +4275,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Tele2 Internet LT"
+  <apn carrier="Tele2 Internet LT"
       mcc="246"
       mnc="03"
       apn="internet.tele2.lt"
@@ -4665,15 +4288,14 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="LMT Internet"
+
+  <apn carrier="LMT Internet"
       mcc="247"
       mnc="01"
       apn="internet.lmt.lv"
       type="default,supl"
   />
-  <apn
-      carrier="LMT MMS"
+  <apn carrier="LMT MMS"
       mcc="247"
       mnc="01"
       apn="mms.lmt.lv"
@@ -4682,8 +4304,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Tele2 LV Internet"
+  <apn carrier="Tele2 LV Internet"
       mcc="247"
       mnc="02"
       apn="internet.tele2.lv"
@@ -4691,8 +4312,7 @@
       password="wap"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 LV MMS"
+  <apn carrier="Tele2 LV MMS"
       mcc="247"
       mnc="02"
       apn="mms.tele2.lv"
@@ -4703,15 +4323,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Bite LV Internet"
+  <apn carrier="Bite LV Internet"
       mcc="247"
       mnc="05"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Bite LV MMS"
+  <apn carrier="Bite LV MMS"
       mcc="247"
       mnc="05"
       apn="mms"
@@ -4722,8 +4340,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Bite LV WAP"
+  <apn carrier="Bite LV WAP"
       mcc="247"
       mnc="05"
       apn="wap"
@@ -4731,15 +4348,14 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="EMT Internet"
+
+  <apn carrier="EMT Internet"
       mcc="248"
       mnc="01"
       apn="internet.emt.ee"
       type="default,supl"
   />
-  <apn
-      carrier="EMT MMS"
+  <apn carrier="EMT MMS"
       mcc="248"
       mnc="01"
       apn="mms.emt.ee"
@@ -4748,8 +4364,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="EMT WAP"
+  <apn carrier="EMT WAP"
       mcc="248"
       mnc="01"
       apn="wap.emt.ee"
@@ -4757,8 +4372,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Send"
+  <apn carrier="Send"
       mcc="248"
       mnc="01"
       apn="send.ee"
@@ -4769,8 +4383,7 @@
       mvno_match_data="248010x2"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Send"
+  <apn carrier="Send"
       mcc="248"
       mnc="01"
       apn="send.ee"
@@ -4781,15 +4394,13 @@
       mvno_match_data="248010x3"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Elisa Internet"
+  <apn carrier="Elisa Internet"
       mcc="248"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Elisa MMS"
+  <apn carrier="Elisa MMS"
       mcc="248"
       mnc="02"
       apn="mms"
@@ -4798,8 +4409,7 @@
       mmsport="8000"
       type="mms"
   />
-  <apn
-      carrier="Elisa WAP"
+  <apn carrier="Elisa WAP"
       mcc="248"
       mnc="02"
       apn="wap"
@@ -4807,8 +4417,7 @@
       port="8000"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="248"
       mnc="03"
       mvno_match_data="24803005x"
@@ -4816,8 +4425,7 @@
       apn="internet.tele2.ee"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 MMS"
+  <apn carrier="Tele2 MMS"
       mcc="248"
       mnc="03"
       mvno_match_data="24803005x"
@@ -4828,8 +4436,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Smart/Ultra MMS"
+  <apn carrier="Smart/Ultra MMS"
       mcc="248"
       mnc="03"
       apn="internet.tele2.ee"
@@ -4840,8 +4447,7 @@
       mvno_match_data="24803005x"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="248"
       mnc="03"
       apn="internet.tele2.ee"
@@ -4849,8 +4455,7 @@
       mvno_match_data="24803000x"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Smart/Ultra MMS"
+  <apn carrier="Smart/Ultra MMS"
       mcc="248"
       mnc="03"
       apn="internet.tele2.ee"
@@ -4861,8 +4466,8 @@
       mvno_match_data="24803000x"
       mvno_type="imsi"
   />
-  <apn
-      carrier="MTS Internet"
+
+  <apn carrier="MTS Internet"
       mcc="250"
       mnc="01"
       apn="internet.mts.ru"
@@ -4870,8 +4475,7 @@
       password="mts"
       type="default,supl"
   />
-  <apn
-      carrier="MTS MMS"
+  <apn carrier="MTS MMS"
       mcc="250"
       mnc="01"
       apn="mms.mts.ru"
@@ -4882,8 +4486,7 @@
       mmsport="9201"
       type="mms"
   />
-  <apn
-      carrier="Megafon Internet"
+  <apn carrier="Megafon Internet"
       mcc="250"
       mnc="02"
       apn="internet"
@@ -4891,8 +4494,7 @@
       password="gdata"
       type="default,supl"
   />
-  <apn
-      carrier="Megafon MMS"
+  <apn carrier="Megafon MMS"
       mcc="250"
       mnc="02"
       apn="mms"
@@ -4903,22 +4505,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="YOTA Internet"
+  <apn carrier="YOTA Internet"
       mcc="250"
       mnc="11"
       apn="yota.ru"
       type="default,supl"
   />
-  <apn
-      carrier="TELE2 Internet"
+  <apn carrier="TELE2 Internet"
       mcc="250"
       mnc="20"
       apn="internet.tele2.ru"
       type="default,supl"
   />
-  <apn
-      carrier="TELE2 MMS"
+  <apn carrier="TELE2 MMS"
       mcc="250"
       mnc="20"
       apn="mms.tele2.ru"
@@ -4927,8 +4526,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Beeline Internet"
+  <apn carrier="Beeline Internet"
       mcc="250"
       mnc="99"
       apn="internet.beeline.ru"
@@ -4936,8 +4534,7 @@
       password="beeline"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline MMS"
+  <apn carrier="Beeline MMS"
       mcc="250"
       mnc="99"
       apn="mms.beeline.ru"
@@ -4948,8 +4545,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Jeans MMS"
+
+  <apn carrier="Jeans MMS"
       mcc="255"
       mnc="01"
       apn="mms.jeans.ua"
@@ -4958,8 +4555,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MTS MMS"
+  <apn carrier="MTS MMS"
       mcc="255"
       mnc="01"
       apn="mms"
@@ -4968,22 +4564,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MTS-internet"
+  <apn carrier="MTS-internet"
       mcc="255"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline-internet"
+  <apn carrier="Beeline-internet"
       mcc="255"
       mnc="02"
       apn="internet.beeline.ua"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline MMS"
+  <apn carrier="Beeline MMS"
       mcc="255"
       mnc="02"
       apn="mms.beeline.ua"
@@ -4992,8 +4585,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Kyivstar MMS"
+  <apn carrier="Kyivstar MMS"
       mcc="255"
       mnc="03"
       apn="mms.kyivstar.net"
@@ -5005,8 +4597,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Kyivstar Internet"
+  <apn carrier="Kyivstar Internet"
       mcc="255"
       mnc="03"
       apn="www.kyivstar.net"
@@ -5015,8 +4606,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Djuice MMS"
+ <apn carrier="Djuice MMS"
       mcc="255"
       mnc="03"
       apn="mms.djuice.com.ua"
@@ -5029,8 +4619,7 @@
       mvno_match_data="DJUICE"
       mvno_type="spn"
   />
-  <apn
-      carrier="Kyivstar MMS"
+  <apn carrier="Kyivstar MMS"
       mcc="255"
       mnc="03"
       apn="mms.kyivstar.net"
@@ -5041,8 +4630,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Djuice Internet"
+  <apn carrier="Djuice Internet"
       mcc="255"
       mnc="03"
       apn="www.djuice.com.ua"
@@ -5050,22 +4638,19 @@
       mvno_match_data="DJUICE"
       mvno_type="spn"
   />
-  <apn
-      carrier="Kyivstar Internet"
+  <apn carrier="Kyivstar Internet"
       mcc="255"
       mnc="03"
       apn="www.kyivstar.net"
       type="default,supl"
   />
-  <apn
-      carrier="Life:) internet"
+  <apn carrier="Life:) internet"
       mcc="255"
       mnc="06"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Life:) MMS"
+  <apn carrier="Life:) MMS"
       mcc="255"
       mnc="06"
       apn="mms"
@@ -5074,15 +4659,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Utel Internet"
+  <apn carrier="Utel Internet"
       mcc="255"
       mnc="07"
       apn="3g.utel.ua"
       type="default,supl"
   />
-  <apn
-      carrier="Utel MMS"
+  <apn carrier="Utel MMS"
       mcc="255"
       mnc="07"
       apn="3g.utel.ua"
@@ -5091,8 +4674,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Velcom Internet"
+
+  <apn carrier="Velcom Internet"
       mcc="257"
       mnc="01"
       apn="web.velcom.by"
@@ -5101,8 +4684,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Velcom MMS"
+  <apn carrier="Velcom MMS"
       mcc="257"
       mnc="01"
       apn="mms.velcom.by"
@@ -5114,8 +4696,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MTS Internet"
+  <apn carrier="MTS Internet"
       mcc="257"
       mnc="02"
       apn="mts"
@@ -5124,8 +4705,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MTS MMS"
+  <apn carrier="MTS MMS"
       mcc="257"
       mnc="02"
       apn="mts"
@@ -5137,16 +4717,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="life:) Internet"
+  <apn carrier="life:) Internet"
       mcc="257"
       mnc="04"
       apn="internet.life.com.by"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="life:) MMS"
+  <apn carrier="life:) MMS"
       mcc="257"
       mnc="04"
       apn="mms.life.com.by"
@@ -5156,8 +4734,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange GPRS Modem"
+
+  <apn carrier="Orange GPRS Modem"
       mcc="259"
       mnc="01"
       apn="internet.orange.md"
@@ -5165,8 +4743,7 @@
       type="default,supl"
       user_editable="0"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="259"
       mnc="01"
       apn="mms.orange.md"
@@ -5176,8 +4753,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Orange IMO"
+  <apn carrier="Orange IMO"
       mcc="259"
       mnc="01"
       apn="wap.orange.md"
@@ -5187,15 +4763,13 @@
       type="wap"
       user_editable="0"
   />
-  <apn
-      carrier="Moldcell Internet"
+  <apn carrier="Moldcell Internet"
       mcc="259"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Moldcell MMS"
+  <apn carrier="Moldcell MMS"
       mcc="259"
       mnc="02"
       apn="mms"
@@ -5204,22 +4778,19 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="Unite Internet PrePay"
+  <apn carrier="Unite Internet PrePay"
       mcc="259"
       mnc="05"
       apn="internet3g.unite.md"
       type="default,supl"
   />
-  <apn
-      carrier="Unite Internet PostPay"
+  <apn carrier="Unite Internet PostPay"
       mcc="259"
       mnc="05"
       apn="internet.unite.md"
       type="default,supl"
   />
-  <apn
-      carrier="Unite MMS"
+  <apn carrier="Unite MMS"
       mcc="259"
       mnc="05"
       apn="mms.unite.md"
@@ -5228,15 +4799,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Plus Internet"
+
+  <apn carrier="Plus Internet"
       mcc="260"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Plus MMS"
+  <apn carrier="Plus MMS"
       mcc="260"
       mnc="01"
       apn="mms"
@@ -5245,15 +4815,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-mobile.pl"
+  <apn carrier="T-mobile.pl"
       mcc="260"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="T-mobile.pl"
+  <apn carrier="T-mobile.pl"
       mcc="260"
       mnc="02"
       apn="mms"
@@ -5262,15 +4830,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="heyahinternet"
+  <apn carrier="heyahinternet"
       mcc="260"
       mnc="02"
       apn="heyah.pl"
       type="default,supl"
   />
-  <apn
-      carrier="heyahmms"
+  <apn carrier="heyahmms"
       mcc="260"
       mnc="02"
       apn="heyahmms"
@@ -5279,17 +4845,15 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange PL IMS"
+  <apn carrier="Orange PL IMS"
       mcc="260"
       mnc="03"
       apn="ims"
       type="ims"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+      protocol="IPV6"
+      roaming_protocol="IPV6"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       carrier_id="1659"
       mcc="260"
       mnc="03"
@@ -5298,11 +4862,10 @@
       password="internet"
       authtype="1"
       type="default,supl,ia*"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+      protocol="IPV6"
+      roaming_protocol="IP"
   />
-  <apn
-      carrier="Orange WAP"
+  <apn carrier="Orange WAP"
       mcc="260"
       mnc="03"
       apn="wap"
@@ -5313,8 +4876,7 @@
       type="default,supl,fota,dun"
       user_editable="0"
   />
-  <apn
-      carrier="MMS Orange"
+  <apn carrier="MMS Orange"
       mcc="260"
       mnc="03"
       apn="mms"
@@ -5326,15 +4888,13 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Play Internet"
+  <apn carrier="Play Internet"
       mcc="260"
       mnc="06"
       apn="internet"
       type="default"
   />
-  <apn
-      carrier="Play MMS"
+  <apn carrier="Play MMS"
       mcc="260"
       mnc="06"
       apn="mms"
@@ -5343,29 +4903,25 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Play Ut"
+  <apn carrier="Play Ut"
       mcc="260"
       mnc="06"
       apn="xcap"
       type="supl"
   />
-  <apn
-      carrier="Play IMS"
+  <apn carrier="Play IMS"
       mcc="260"
       mnc="06"
       apn="ims"
       type="ims"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="260"
       mnc="33"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="Telekom Internet"
+    <apn carrier="Telekom Internet"
       mcc="262"
       mnc="01"
       apn="internet.v6.telekom"
@@ -5376,8 +4932,7 @@
       roaming_protocol="IP"
       type="default"
   />
-  <apn
-      carrier="HOS"
+  <apn carrier="HOS"
       mcc="262"
       mnc="01"
       apn="hos"
@@ -5394,21 +4949,19 @@
       type="mms"
   />
   <!-- MVNO congstar -->
-  <apn
-      carrier="congstar Internet"
-      mcc="262"
-      mnc="01"
-      apn="internet.telekom"
-      user="congstar"
-      password="cs"
-      type="default,supl"
-      authtype="1"
-      protocol="IPV4V6"
-      mvno_type="gid"
-      mvno_match_data="44"
+  <apn carrier="congstar Internet"
+       mcc="262"
+       mnc="01"
+       apn="internet.telekom"
+       user="congstar"
+       password="cs"
+       type="default,supl"
+       authtype="1"
+       protocol="IPV4V6"
+       mvno_type="gid"
+       mvno_match_data="44"
   />
-  <apn
-      carrier="Vodafone DE IMS"
+  <apn carrier="Vodafone DE IMS"
       mcc="262"
       mnc="02"
       apn="ims"
@@ -5417,8 +4970,7 @@
       roaming_protocol="IPV4V6"
       user_visible="0"
   />
-  <apn
-      carrier="VF DE Event"
+  <apn carrier="VF DE Event"
       mcc="262"
       mnc="02"
       apn="event.vodafone.de"
@@ -5429,8 +4981,7 @@
       protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="VF DE Web"
+  <apn carrier="VF DE Web"
       mcc="262"
       mnc="02"
       apn="web.vodafone.de"
@@ -5438,8 +4989,7 @@
       protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="E-Plus Internet"
+  <apn carrier="E-Plus Internet"
       mcc="262"
       mnc="03"
       apn="internet.eplus.de"
@@ -5448,16 +4998,14 @@
       authtype="0"
       type="default"
   />
-  <apn
-      carrier="o2 Internet Prepaid"
+  <apn carrier="o2 Internet Prepaid"
       mcc="262"
       mnc="07"
       apn="pinternet.interkom.de"
       authtype="0"
       type="default"
   />
-  <apn
-      carrier="E-Plus MMS"
+  <apn carrier="E-Plus MMS"
       mcc="262"
       mnc="03"
       apn="mms.eplus.de"
@@ -5466,8 +5014,7 @@
       mmsport="5080"
       type="mms"
   />
-  <apn
-      carrier="Telekom Internet"
+  <apn carrier="Telekom Internet"
       mcc="262"
       mnc="06"
       apn="internet.v6.telekom"
@@ -5478,8 +5025,7 @@
       roaming_protocol="IP"
       type="default"
   />
-  <apn
-      carrier="HOS"
+  <apn carrier="HOS"
       mcc="262"
       mnc="06"
       apn="hos"
@@ -5495,8 +5041,7 @@
       roaming_protocol="IP"
       type="mms"
   />
-  <apn
-      carrier="o2 MMS Prepaid"
+  <apn carrier="o2 MMS Prepaid"
       mcc="262"
       mnc="07"
       apn="pinternet.interkom.de"
@@ -5505,8 +5050,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="o2 IMS"
+  <apn carrier="o2 IMS"
       mcc="262"
       mnc="07"
       apn="ims"
@@ -5516,8 +5060,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="o2 IMS"
+  <apn carrier="o2 IMS"
       mcc="262"
       mnc="07"
       apn="ims"
@@ -5527,11 +5070,10 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="o2 Internet"
+  <apn carrier="o2 Internet"
       mcc="262"
       mnc="07"
-      mvno_match_data="2620739"
+      mvno_match_data="26207"
       mvno_type="imsi"
       apn="internet"
       mmsc="http://10.81.0.7:8002"
@@ -5539,8 +5081,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="o2 Internet Prepaid"
+  <apn carrier="o2 Internet Prepaid"
       mcc="262"
       mnc="07"
       apn="pinternet.interkom.de"
@@ -5551,8 +5092,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Alice"
+  <apn carrier="Alice"
       mcc="262"
       mnc="07"
       apn="internet.partner1"
@@ -5563,8 +5103,7 @@
       mvno_type="spn"
       mvno_match_data="Alice"
   />
-  <apn
-      carrier="Fonic Prepaid"
+  <apn carrier="Fonic Prepaid"
       mcc="262"
       mnc="07"
       apn="pinternet.interkom.de"
@@ -5575,8 +5114,7 @@
       mvno_match_data="26207515"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Lidl Mobile"
+  <apn carrier="Lidl Mobile"
       mcc="262"
       mnc="07"
       apn="pinternet.interkom.de"
@@ -5587,8 +5125,7 @@
       mvno_match_data="26207520"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Tchibo Internet"
+  <apn carrier="Tchibo Internet"
       mcc="262"
       mnc="07"
       apn="webmobil1"
@@ -5599,15 +5136,14 @@
       mvno_match_data="26207500"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="262"
       mnc="42"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone Net2"
+
+  <apn carrier="Vodafone Net2"
       mcc="268"
       mnc="01"
       apn="net2.vodafone.pt"
@@ -5619,8 +5155,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="Vodafone Internet"
+  <apn carrier="Vodafone Internet"
       mcc="268"
       mnc="01"
       apn="internet.vodafone.pt"
@@ -5628,8 +5163,7 @@
       protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Vodafone WAP"
+  <apn carrier="Vodafone WAP"
       mcc="268"
       mnc="01"
       apn="wap.vodafone.pt"
@@ -5641,8 +5175,7 @@
       protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="268"
       mnc="01"
       apn="net2.vodafone.pt"
@@ -5653,15 +5186,13 @@
       protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Optimus Internet"
+  <apn carrier="Optimus Internet"
       mcc="268"
       mnc="03"
       apn="umts"
       type="default"
   />
-  <apn
-      carrier="Optimus MMS"
+  <apn carrier="Optimus MMS"
       mcc="268"
       mnc="03"
       apn="mms"
@@ -5670,15 +5201,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="tmn internet"
+  <apn carrier="tmn internet"
       mcc="268"
       mnc="06"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="mms tmn"
+  <apn carrier="mms tmn"
       mcc="268"
       mnc="06"
       apn="mmsc.tmn.pt"
@@ -5689,8 +5218,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="LUXGSM MMS"
+
+  <apn carrier="LUXGSM MMS"
       mcc="270"
       mnc="01"
       apn="mms.pt.lu"
@@ -5701,8 +5230,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="LUXGSM WAP"
+  <apn carrier="LUXGSM WAP"
       mcc="270"
       mnc="01"
       apn="wap.pt.lu"
@@ -5712,8 +5240,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Tango WAP"
+  <apn carrier="Tango WAP"
       mcc="270"
       mnc="77"
       apn="internet"
@@ -5723,8 +5250,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Tango MMS"
+  <apn carrier="Tango MMS"
       mcc="270"
       mnc="77"
       apn="mms"
@@ -5735,8 +5261,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vox Mobile"
+  <apn carrier="Vox Mobile"
       mcc="270"
       mnc="99"
       apn="vox.lu"
@@ -5745,15 +5270,14 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Vodafone live!"
+
+  <apn carrier="Vodafone live!"
       mcc="272"
       mnc="01"
       apn="live.vodafone.com"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="272"
       mnc="01"
       apn="mms.vodafone.net"
@@ -5762,15 +5286,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="272"
       mnc="01"
       apn="hs.vodafone.ie"
       type="default,dun"
   />
-  <apn
-      carrier="O2 Ireland"
+  <apn carrier="O2 Ireland"
       mcc="272"
       mnc="02"
       apn="internet"
@@ -5781,23 +5303,20 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="O2.ie Mobile Hotspot"
+  <apn carrier="O2.ie Mobile Hotspot"
       mcc="272"
       mnc="02"
       apn="Open.internet"
       authtype="0"
       type="dun"
   />
-  <apn
-      carrier="Meteor Data"
+  <apn carrier="Meteor Data"
       mcc="272"
       mnc="03"
       apn="data.mymeteor.ie"
       type="default,supl"
   />
-  <apn
-      carrier="Meteor"
+  <apn carrier="Meteor"
       mcc="272"
       mnc="03"
       apn="mms.mymeteor.ie"
@@ -5808,8 +5327,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="272"
       mnc="05"
       apn="3ireland.ie"
@@ -5818,8 +5336,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Tesco"
+  <apn carrier="Tesco"
       mcc="272"
       mnc="11"
       mvno_match_data="0A"
@@ -5830,8 +5347,8 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Siminn Internet"
+
+  <apn carrier="Siminn Internet"
       mcc="274"
       mnc="01"
       apn="internet"
@@ -5839,8 +5356,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Siminn MMS"
+  <apn carrier="Siminn MMS"
       mcc="274"
       mnc="01"
       apn="mms.simi.is"
@@ -5849,15 +5365,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone Internet"
+  <apn carrier="Vodafone Internet"
       mcc="274"
       mnc="02"
       apn="gprs.is"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="274"
       mnc="02"
       apn="mms.gprs.is"
@@ -5866,16 +5380,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone Internet"
+  <apn carrier="Vodafone Internet"
       mcc="274"
       mnc="03"
       apn="gprs.is"
       authtype="0"
       type="default,supl,agps,fota,dun"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="274"
       mnc="03"
       apn="mms.gprs.is"
@@ -5885,8 +5397,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MMS Nova"
+  <apn carrier="MMS Nova"
       mcc="274"
       mnc="11"
       apn="mms.nova.is"
@@ -5895,8 +5406,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Net Nova"
+  <apn carrier="Net Nova"
       mcc="274"
       mnc="11"
       apn="net.nova.is"
@@ -5904,8 +5414,8 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MT"
+
+  <apn carrier="Vodafone MT"
       mcc="278"
       mnc="01"
       apn="internet"
@@ -5913,8 +5423,7 @@
       password="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MT-MMS"
+  <apn carrier="Vodafone MT-MMS"
       mcc="278"
       mnc="01"
       apn="mms.vodafone.com.mt"
@@ -5923,8 +5432,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CYTA"
+
+  <apn carrier="CYTA"
       mcc="280"
       mnc="01"
       apn="cytamobile"
@@ -5935,8 +5444,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="MTN MMS"
+  <apn carrier="MTN MMS"
       mcc="280"
       mnc="10"
       apn="mms"
@@ -5947,8 +5455,7 @@
       mmsport="3130"
       type="mms"
   />
-  <apn
-      carrier="MTN Wap"
+  <apn carrier="MTN Wap"
       mcc="280"
       mnc="10"
       apn="wap"
@@ -5958,8 +5465,8 @@
       port="3130"
       type="default,supl"
   />
-  <apn
-      carrier="Orange Armenia MMS"
+
+  <apn carrier="Orange Armenia MMS"
       mcc="283"
       mnc="10"
       apn="mms"
@@ -5969,23 +5476,21 @@
       type="mms"
       authtype="1"
   />
-  <apn
-      carrier="Orange Armenia Internet"
+  <apn carrier="Orange Armenia Internet"
       mcc="283"
       mnc="10"
       apn="Internet"
       type="default"
       authtype="1"
   />
-  <apn
-      carrier="M-Tel"
+
+  <apn carrier="M-Tel"
       mcc="284"
       mnc="01"
       apn="wap-gprs.mtel.bg"
       type="default,supl"
   />
-  <apn
-      carrier="M-Tel MMS"
+  <apn carrier="M-Tel MMS"
       mcc="284"
       mnc="01"
       apn="mms-gprs.mtel.bg"
@@ -5996,8 +5501,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vivacom WAP"
+  <apn carrier="Vivacom WAP"
       mcc="284"
       mnc="03"
       apn="wap.vivacom.bg"
@@ -6007,8 +5511,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vivacom MMS"
+  <apn carrier="Vivacom MMS"
       mcc="284"
       mnc="03"
       apn="mms.vivacom.bg"
@@ -6019,15 +5522,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="GPRS GLOBUL"
+  <apn carrier="GPRS GLOBUL"
       mcc="284"
       mnc="05"
       apn="globul"
       type="default,supl"
   />
-  <apn
-      carrier="GLOBUL MMS GPRS"
+  <apn carrier="GLOBUL MMS GPRS"
       mcc="284"
       mnc="05"
       apn="mms.globul.bg"
@@ -6037,22 +5538,20 @@
       mmsport="8004"
       type="mms"
   />
-  <apn
-      carrier="bulsatcom"
+  <apn carrier="bulsatcom"
       mcc="284"
       mnc="11"
       apn="bulsat.com"
       type="default,supl"
   />
-  <apn
-      carrier="MAX TELECOM"
+  <apn carrier="MAX TELECOM"
       mcc="284"
       mnc="13"
       apn="apn.maxtelecom.bg"
       type="default,supl"
   />
-  <apn
-      carrier="TURKCELL INTERNET"
+
+  <apn carrier="TURKCELL INTERNET"
       mcc="286"
       mnc="01"
       apn="internet"
@@ -6060,8 +5559,7 @@
       password="gprs"
       type="default,supl"
   />
-  <apn
-      carrier="Turkcell MMS"
+  <apn carrier="Turkcell MMS"
       mcc="286"
       mnc="01"
       apn="mms"
@@ -6072,8 +5570,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone Internet"
+  <apn carrier="Vodafone Internet"
       mcc="286"
       mnc="02"
       apn="internet"
@@ -6081,8 +5578,7 @@
       password="vodafone"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="286"
       mnc="02"
       apn="mms"
@@ -6093,8 +5589,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="AVEA INTERNET"
+  <apn carrier="AVEA INTERNET"
       mcc="286"
       mnc="03"
       apn="internet"
@@ -6102,8 +5597,7 @@
       password="wap"
       type="default,supl"
   />
-  <apn
-      carrier="Avea MMS"
+  <apn carrier="Avea MMS"
       mcc="286"
       mnc="03"
       apn="mms"
@@ -6114,15 +5608,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Tele Internet"
+
+  <apn carrier="Tele Internet"
       mcc="290"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Tele MMS"
+  <apn carrier="Tele MMS"
       mcc="290"
       mnc="01"
       apn="mms"
@@ -6131,8 +5624,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone live!"
+  <apn carrier="Vodafone live!"
       mcc="293"
       mnc="40"
       apn="internet.simobil.si"
@@ -6142,8 +5634,7 @@
       port="9201"
       type="default,supl"
   />
-  <apn
-      carrier="Si.mobil MMS"
+  <apn carrier="Si.mobil MMS"
       mcc="293"
       mnc="40"
       apn="mms.simobil.si"
@@ -6154,8 +5645,7 @@
       mmsport="9201"
       type="mms"
   />
-  <apn
-      carrier="Planet"
+  <apn carrier="Planet"
       mcc="293"
       mnc="41"
       apn="internet"
@@ -6165,8 +5655,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Mobitel MMS"
+  <apn carrier="Mobitel MMS"
       mcc="293"
       mnc="41"
       apn="internet"
@@ -6177,8 +5666,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T2"
+  <apn carrier="T2"
       mcc="293"
       mnc="64"
       apn="internet.t-2.net"
@@ -6187,8 +5675,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Tusmobil Internet"
+  <apn carrier="Tusmobil Internet"
       mcc="293"
       mnc="70"
       apn="internet.tusmobil.si"
@@ -6197,8 +5684,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Tusmobil MMS"
+  <apn carrier="Tusmobil MMS"
       mcc="293"
       mnc="70"
       apn="mms.tusmobil.si"
@@ -6210,8 +5696,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Telemach Internet"
+  <apn carrier="Telemach Internet"
       mcc="293"
       mnc="70"
       apn="telemach.net"
@@ -6222,8 +5707,8 @@
       mvno_match_data="29370029xxxxxxx"
       type="default,supl,mms"
   />
-  <apn
-      carrier="T-Mobile MK Internet"
+
+  <apn carrier="T-Mobile MK Internet"
       mcc="294"
       mnc="01"
       apn="internet"
@@ -6231,8 +5716,7 @@
       password="t-mobile"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile MK MMS"
+  <apn carrier="T-Mobile MK MMS"
       mcc="294"
       mnc="01"
       apn="mms"
@@ -6243,8 +5727,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cosmofon"
+   <apn carrier="Cosmofon"
       mcc="294"
       mnc="02"
       apn="Internet"
@@ -6254,8 +5737,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Cosmofon MMS"
+  <apn carrier="Cosmofon MMS"
       mcc="294"
       mnc="02"
       apn="mms"
@@ -6264,8 +5746,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="294"
       mnc="03"
       apn="vipoperator"
@@ -6275,8 +5756,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="294"
       mnc="03"
       apn="vipoperator.mms"
@@ -6287,8 +5767,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile MMS"
+
+  <apn carrier="T-Mobile MMS"
       mcc="297"
       mnc="02"
       apn="mms"
@@ -6299,8 +5779,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile Internet"
+  <apn carrier="T-Mobile Internet"
       mcc="297"
       mnc="02"
       apn="tmcg-wnw"
@@ -6310,8 +5789,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Telus"
+  <apn carrier="Telus"
       mcc="302"
       mnc="220"
       apn="sp.telus.com"
@@ -6321,8 +5799,7 @@
       mmsport="80"
       protocol="IP"
   />
-  <apn
-      carrier="TELUS"
+  <apn carrier="TELUS"
       mcc="302"
       mnc="220"
       apn="sp.telus.com"
@@ -6333,8 +5810,7 @@
       mvno_match_data="54"
       mvno_type="gid"
   />
-  <apn
-      carrier="Koodo"
+  <apn carrier="Koodo"
       mcc="302"
       mnc="220"
       apn="sp.koodo.com"
@@ -6345,8 +5821,7 @@
       mmsport="80"
       mvno_type="gid"
   />
-  <apn
-      carrier="Mobile Internet"
+  <apn carrier="Mobile Internet"
       mcc="302"
       mnc="220"
       apn="sp.mb.com"
@@ -6357,8 +5832,7 @@
       mvno_match_data="50"
       mvno_type="gid"
   />
-  <apn
-      carrier="Tethered Mobile Internet"
+  <apn carrier="Tethered Mobile Internet"
       mcc="302"
       mnc="220"
       apn="isp.mb.com"
@@ -6366,20 +5840,18 @@
       mvno_type="gid"
       mvno_match_data="50"
   />
-  <apn
-      carrier="Mobile Internet"
-      mcc="302"
-      mnc="220"
-      apn="sp.mb.com"
-      type="default,mms,agps,supl,fota,hipri"
-      mmsc="http://aliasredirect.net/proxy/mb/mmsc"
-      mmsproxy="74.49.0.18"
-      mmsport="80"
-      mvno_type="gid"
-      mvno_match_data="4D4F"
+  <apn carrier="Mobile Internet"
+       mcc="302"
+       mnc="220"
+       apn="sp.mb.com"
+       type="default,mms,agps,supl,fota,hipri"
+       mmsc="http://aliasredirect.net/proxy/mb/mmsc"
+       mmsproxy="74.49.0.18"
+       mmsport="80"
+       mvno_type="gid"
+       mvno_match_data="4D4F"
   />
-  <apn
-      carrier="Tethered Mobile Internet"
+  <apn carrier="Tethered Mobile Internet"
       mcc="302"
       mnc="220"
       apn="isp.mb.com"
@@ -6387,8 +5859,7 @@
       mvno_type="gid"
       mvno_match_data="4D4F"
   />
-  <apn
-      carrier="TELUS ISP"
+  <apn carrier="TELUS ISP"
       mcc="302"
       mnc="220"
       apn="isp.telus.com"
@@ -6396,8 +5867,7 @@
       mvno_type="gid"
       mvno_match_data="54"
   />
-  <apn
-      carrier="TELUS IMS"
+  <apn carrier="TELUS IMS"
       mcc="302"
       mnc="220"
       apn="ims"
@@ -6405,8 +5875,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="TELUS"
+  <apn carrier="TELUS"
       mcc="302"
       mnc="221"
       apn="sp.telus.com"
@@ -6417,8 +5886,7 @@
       mvno_match_data="54"
       mvno_type="gid"
   />
-  <apn
-      carrier="Koodo"
+  <apn carrier="Koodo"
       mcc="302"
       mnc="221"
       apn="sp.koodo.com"
@@ -6429,8 +5897,7 @@
       mvno_match_data="4B"
       mvno_type="gid"
   />
-  <apn
-      carrier="PC mobile"
+  <apn carrier="PC mobile"
       mcc="302"
       mnc="221"
       apn="sp.mb.com"
@@ -6441,8 +5908,7 @@
       mvno_match_data="50"
       mvno_type="gid"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="302"
       mnc="270"
       apn="mms.mobi.eastlink.ca"
@@ -6451,15 +5917,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="302"
       mnc="270"
       apn="wisp.mobi.eastlink.ca"
       type="default,supl"
   />
-  <apn
-      carrier="MOWAP"
+  <apn carrier="MOWAP"
       mcc="302"
       mnc="320"
       apn="wap.davewireless.com"
@@ -6467,8 +5931,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MOMMS"
+  <apn carrier="MOMMS"
       mcc="302"
       mnc="320"
       apn="mms.davewireless.com"
@@ -6477,8 +5940,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Fido Tethering"
+  <apn carrier="Fido Tethering"
       mcc="302"
       mnc="370"
       apn="ltedata.apn"
@@ -6488,8 +5950,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Fido Internet"
+  <apn carrier="Fido Internet"
       mcc="302"
       mnc="370"
       apn="ltemobile.apn"
@@ -6502,8 +5963,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="MTS"
+  <apn carrier="MTS"
       mcc="302"
       mnc="370"
       apn="sp.mts"
@@ -6516,8 +5976,7 @@
       mvno_match_data="2C"
       mvno_type="gid"
   />
-  <apn
-      carrier="MTS Tethering S"
+  <apn carrier="MTS Tethering S"
       mcc="302"
       mnc="370"
       apn="internet.mts"
@@ -6527,8 +5986,7 @@
       mvno_type="gid"
       mvno_match_data="2C"
   />
-  <apn
-      carrier="MTS-Roaming"
+  <apn carrier="MTS-Roaming"
       mcc="302"
       mnc="370"
       apn="sp.mts"
@@ -6537,16 +5995,14 @@
       mmsport="9401"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="302"
       mnc="490"
       protocol="IPV4V6"
       apn="internet.windmobile.ca"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="302"
       mnc="490"
       apn="mms.windmobile.ca"
@@ -6555,32 +6011,28 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Media"
+  <apn carrier="Media"
       mcc="302"
       mnc="500"
       apn="media.ng"
       mmsc="http://media.videotron.com"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Media"
+  <apn carrier="Media"
       mcc="302"
       mnc="510"
       apn="media.ng"
       mmsc="http://media.videotron.com"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Media"
+  <apn carrier="Media"
       mcc="302"
       mnc="520"
       apn="media.ng"
       mmsc="http://media.videotron.com"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Bell"
+  <apn carrier="Bell"
       mcc="302"
       mnc="610"
       apn="pda.bell.ca"
@@ -6592,8 +6044,7 @@
       type="default,mms,supl"
       protocol="IP"
   />
-  <apn
-      carrier="MTS"
+  <apn carrier="MTS"
       mcc="302"
       mnc="660"
       apn="sp.mts"
@@ -6606,8 +6057,7 @@
       mvno_match_data="2C"
       mvno_type="gid"
   />
-  <apn
-      carrier="MTS Tethering"
+  <apn carrier="MTS Tethering"
       mcc="302"
       mnc="660"
       apn="internet.mts"
@@ -6617,8 +6067,7 @@
       mvno_type="gid"
       mvno_match_data="2C"
   />
-  <apn
-      carrier="Rogers"
+  <apn carrier="Rogers"
       mcc="302"
       mnc="720"
       apn="ltemobile.apn"
@@ -6628,16 +6077,14 @@
       type="default,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="302"
       mnc="720"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="chatr"
+  <apn carrier="chatr"
       mcc="302"
       mnc="720"
       apn="chatrweb.apn"
@@ -6652,8 +6099,7 @@
       mvno_match_data="302720x94"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Chatr Tethering"
+  <apn carrier="Chatr Tethering"
       mcc="302"
       mnc="720"
       apn="chatrisp.apn"
@@ -6663,8 +6109,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Tbaytel Tethering"
+  <apn carrier="Tbaytel Tethering"
       mcc="302"
       mnc="720"
       apn="ltedata.apn"
@@ -6674,8 +6119,7 @@
       mvno_type="gid"
       mvno_match_data="BA"
   />
-  <apn
-      carrier="Rogers"
+  <apn carrier="Rogers"
       mcc="302"
       mnc="720"
       apn="ltemobile.apn"
@@ -6688,8 +6132,7 @@
       mvno_type="gid"
       mvno_match_data="BA"
   />
-  <apn
-      carrier="Cityfone Tethering"
+  <apn carrier="Cityfone Tethering"
       mcc="302"
       mnc="720"
       apn="ltedata.apn"
@@ -6699,8 +6142,7 @@
       mvno_type="spn"
       mvno_match_data="CITYFONE"
   />
-  <apn
-      carrier="Cityfone Internet"
+  <apn carrier="Cityfone Internet"
       mcc="302"
       mnc="720"
       apn="ltemobile.apn"
@@ -6713,8 +6155,7 @@
       mvno_type="spn"
       mvno_match_data="CITYFONE"
   />
-  <apn
-      carrier="Rogers"
+  <apn carrier="Rogers"
       mcc="302"
       mnc="720"
       apn="rogers-core-appl1.apn"
@@ -6723,8 +6164,7 @@
       mmsport="80"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Rogers Tethering"
+  <apn carrier="Rogers Tethering"
       mcc="302"
       mnc="720"
       apn="ltedata.apn"
@@ -6734,8 +6174,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Rogers Internet"
+  <apn carrier="Rogers Internet"
       mcc="302"
       mnc="720"
       apn="ltemobile.apn"
@@ -6748,8 +6187,7 @@
       protocol="IPV4V6"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Chatr Internet"
+  <apn carrier="Chatr Internet"
       mcc="302"
       mnc="720"
       apn="chatrweb.apn"
@@ -6758,8 +6196,7 @@
       mmsport="80"
       type="default,mms"
   />
-  <apn
-      carrier="SaskTel"
+  <apn carrier="SaskTel"
       mcc="302"
       mnc="780"
       apn="pda.stm.sk.ca"
@@ -6768,18 +6205,17 @@
       mmsport="80"
       type="default,mms,supl"
   />
-  <apn
-      carrier="Verizon CDMA HRPD"
-      mcc="310"
-      mnc="000"
-      mmsc="http://mms.vzwreseller.com/servlets/mms"
-      type="default,mms,hipri,dun,supl"
-      mvno_type="spn"
-      mvno_match_data="Tracfone"
-      authtype="3"
+
+  <apn carrier="Verizon CDMA HRPD"
+     mcc="310"
+     mnc="000"
+     mmsc="http://mms.vzwreseller.com/servlets/mms"
+     type="default,mms,hipri,dun,supl"
+     mvno_type="spn"
+     mvno_match_data="Tracfone"
+     authtype="3"
   />
-  <apn
-      carrier="Bluewire"
+  <apn carrier="Bluewire"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -6794,8 +6230,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Bluewire IMS"
+  <apn carrier="Bluewire IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -6806,8 +6241,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Bluewire IMS"
+  <apn carrier="Bluewire IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -6818,8 +6252,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Bluewire FOTA"
+  <apn carrier="Bluewire FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -6830,8 +6263,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Bluewire FOTA"
+  <apn carrier="Bluewire FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -6842,8 +6274,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Bluewire"
+  <apn carrier="Bluewire"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -6857,8 +6288,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Bluewire"
+  <apn carrier="Bluewire"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -6872,8 +6302,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="flatwire"
+  <apn carrier="flatwire"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -6888,8 +6317,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Flatwire IMS"
+  <apn carrier="Flatwire IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -6900,8 +6328,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Flatwire IMS"
+  <apn carrier="Flatwire IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -6912,8 +6339,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Flatwire FOTA"
+  <apn carrier="Flatwire FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -6924,8 +6350,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Flatwire FOTA"
+  <apn carrier="Flatwire FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -6936,8 +6361,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Flatwire"
+  <apn carrier="Flatwire"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -6951,8 +6375,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Flatwire"
+  <apn carrier="Flatwire"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -6966,8 +6389,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="mobipcs"
+  <apn carrier="mobipcs"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -6982,8 +6404,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Mobipcs IMS"
+  <apn carrier="Mobipcs IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -6994,8 +6415,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mobipcs IMS"
+  <apn carrier="Mobipcs IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7006,8 +6426,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mobipcs FOTA"
+  <apn carrier="Mobipcs FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7018,8 +6437,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mobipcs FOTA"
+  <apn carrier="Mobipcs FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7030,8 +6448,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mobipcs"
+  <apn carrier="Mobipcs"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7045,8 +6462,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mobipcs"
+  <apn carrier="Mobipcs"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7060,8 +6476,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="mobilenation"
+  <apn carrier="mobilenation"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -7076,8 +6491,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Mobilenation IMS"
+  <apn carrier="Mobilenation IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7088,8 +6502,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mobilenation IMS"
+  <apn carrier="Mobilenation IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7100,8 +6513,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mobilenation FOTA"
+  <apn carrier="Mobilenation FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7112,8 +6524,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mobilenation FOTA"
+  <apn carrier="Mobilenation FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7124,8 +6535,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mobilenation"
+  <apn carrier="Mobilenation"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7139,8 +6549,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mobilenation"
+  <apn carrier="Mobilenation"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7154,8 +6563,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="mohave"
+  <apn carrier="mohave"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -7170,8 +6578,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Mohave IMS"
+  <apn carrier="Mohave IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7182,8 +6589,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mohave IMS"
+  <apn carrier="Mohave IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7194,8 +6600,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mohave FOTA"
+  <apn carrier="Mohave FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7206,8 +6611,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mohave FOTA"
+  <apn carrier="Mohave FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7218,8 +6622,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mohave"
+  <apn carrier="Mohave"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7233,8 +6636,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mohave"
+  <apn carrier="Mohave"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7248,8 +6650,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="peopleswire"
+  <apn carrier="peopleswire"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -7264,8 +6665,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Peopleswire IMS"
+  <apn carrier="Peopleswire IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7276,8 +6676,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Peopleswire IMS"
+  <apn carrier="Peopleswire IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7288,8 +6687,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="peopleswire FOTA"
+  <apn carrier="peopleswire FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7300,8 +6698,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="peopleswire FOTA"
+  <apn carrier="peopleswire FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7312,8 +6709,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Peopleswire"
+  <apn carrier="Peopleswire"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7327,8 +6723,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Peopleswire"
+  <apn carrier="Peopleswire"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7342,8 +6737,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="revol"
+  <apn carrier="revol"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -7358,8 +6752,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Revol IMS"
+  <apn carrier="Revol IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7370,8 +6763,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Revol IMS"
+  <apn carrier="Revol IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7382,8 +6774,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Revol FOTA"
+  <apn carrier="Revol FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7394,8 +6785,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Revol FOTA"
+  <apn carrier="Revol FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7406,8 +6796,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Revol"
+  <apn carrier="Revol"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7421,8 +6810,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Revol"
+  <apn carrier="Revol"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7436,8 +6824,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Commnet"
+  <apn carrier="Commnet"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -7452,8 +6839,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="distribution"
+  <apn carrier="distribution"
       mcc="310"
       mnc="000"
       apn="CdmaNai"
@@ -7468,8 +6854,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Distribution IMS"
+  <apn carrier="Distribution IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7480,8 +6865,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Distribution IMS"
+  <apn carrier="Distribution IMS"
       mcc="310"
       mnc="000"
       apn="VZWIMS"
@@ -7492,8 +6876,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Distribution FOTA"
+  <apn carrier="Distribution FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7504,8 +6887,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Distribution FOTA"
+  <apn carrier="Distribution FOTA"
       mcc="310"
       mnc="000"
       apn="VZWADMIN"
@@ -7516,8 +6898,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Distribution"
+  <apn carrier="Distribution"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7531,8 +6912,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Distribution"
+  <apn carrier="Distribution"
       mcc="310"
       mnc="000"
       apn="VZWINTERNET"
@@ -7546,8 +6926,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7557,8 +6936,7 @@
       protocol="IPV4V6"
       bearer="4"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7568,8 +6946,7 @@
       protocol="IPV4V6"
       bearer="4"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7579,8 +6956,7 @@
       protocol="IPV4V6"
       bearer="5"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7590,8 +6966,7 @@
       protocol="IPV4V6"
       bearer="5"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7601,8 +6976,7 @@
       protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7612,8 +6986,7 @@
       protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7623,8 +6996,7 @@
       protocol="IPV4V6"
       bearer="7"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7634,8 +7006,7 @@
       protocol="IPV4V6"
       bearer="7"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7645,8 +7016,7 @@
       protocol="IPV4V6"
       bearer="8"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7656,8 +7026,7 @@
       protocol="IPV4V6"
       bearer="8"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7667,8 +7036,7 @@
       protocol="IPV4V6"
       bearer="12"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="310"
       mnc="004"
       apn="internet"
@@ -7678,8 +7046,7 @@
       protocol="IPV4V6"
       bearer="12"
   />
-  <apn
-      carrier="Verizon Internet"
+  <apn carrier="Verizon Internet"
       mcc="310"
       mnc="004"
       apn="VZWINTERNET"
@@ -7692,8 +7059,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon Internet"
+  <apn carrier="Verizon Internet"
       mcc="310"
       mnc="004"
       apn="VZWINTERNET"
@@ -7706,8 +7072,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon FOTA"
+  <apn carrier="Verizon FOTA"
       mcc="310"
       mnc="004"
       apn="VZWADMIN"
@@ -7720,8 +7085,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon FOTA"
+  <apn carrier="Verizon FOTA"
       mcc="310"
       mnc="004"
       apn="VZWADMIN"
@@ -7734,8 +7098,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon IMS"
+  <apn carrier="Verizon IMS"
       mcc="310"
       mnc="004"
       apn="VZWIMS"
@@ -7748,8 +7111,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon IMS"
+  <apn carrier="Verizon IMS"
       mcc="310"
       mnc="004"
       apn="VZWIMS"
@@ -7762,8 +7124,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon CBS"
+  <apn carrier="Verizon CBS"
       mcc="310"
       mnc="004"
       apn="VZWAPP"
@@ -7777,8 +7138,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon CBS"
+  <apn carrier="Verizon CBS"
       mcc="310"
       mnc="004"
       apn="VZWAPP"
@@ -7792,8 +7152,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Verizon Emergency"
+  <apn carrier="Verizon Emergency"
       mcc="310"
       mnc="004"
       apn="VZWEMERGENCY"
@@ -7802,8 +7161,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Union Wireless Data"
+  <apn carrier="Union Wireless Data"
       mcc="310"
       mnc="020"
       apn="union.wap.com"
@@ -7811,8 +7169,7 @@
       port="8799"
       type="default,hipri,dun,supl"
   />
-  <apn
-      carrier="Union Wireless MMS"
+  <apn carrier="Union Wireless MMS"
       mcc="310"
       mnc="020"
       apn="union.mms.com"
@@ -7821,8 +7178,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier=" ALU Test-SIM Internet"
+  <apn carrier=" ALU Test-SIM Internet"
       mcc="310"
       mnc="028"
       apn="VZWINTERNET"
@@ -7831,8 +7187,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier=" ALU Test-SIM FOTA"
+  <apn carrier=" ALU Test-SIM FOTA"
       mcc="310"
       mnc="028"
       apn="VZWADMIN"
@@ -7840,8 +7195,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier=" ALU Test-SIM IMS"
+  <apn carrier=" ALU Test-SIM IMS"
       mcc="310"
       mnc="028"
       apn="VZWIMS"
@@ -7849,8 +7203,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier=" ALU Test-SIM CBS"
+  <apn carrier=" ALU Test-SIM CBS"
       mcc="310"
       mnc="028"
       apn="VZWAPP"
@@ -7859,8 +7212,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="myBlue Pix"
+  <apn carrier="myBlue Pix"
       mcc="310"
       mnc="030"
       apn="mmswap.centennialwireless.com"
@@ -7869,8 +7221,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="310"
       mnc="030"
       apn="private.centennialwireless.com"
@@ -7878,8 +7229,7 @@
       password="priv"
       type="default,supl"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="030"
       apn="nxtgenphone"
@@ -7890,8 +7240,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="030"
       apn="ims"
@@ -7899,8 +7248,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="itewire"
+  <apn carrier="itewire"
       mcc="310"
       mnc="032"
       apn="CdmaNai"
@@ -7915,8 +7263,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Itewire IMS"
+  <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
       apn="VZWIMS"
@@ -7927,8 +7274,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Itewire IMS"
+  <apn carrier="Itewire IMS"
       mcc="310"
       mnc="032"
       apn="VZWIMS"
@@ -7939,8 +7285,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Itewire FOTA"
+  <apn carrier="Itewire FOTA"
       mcc="310"
       mnc="032"
       apn="VZWADMIN"
@@ -7951,8 +7296,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Itewire FOTA"
+  <apn carrier="Itewire FOTA"
       mcc="310"
       mnc="032"
       apn="VZWADMIN"
@@ -7963,8 +7307,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Itewire"
+  <apn carrier="Itewire"
       mcc="310"
       mnc="032"
       apn="VZWINTERNET"
@@ -7978,8 +7321,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Itewire"
+  <apn carrier="Itewire"
       mcc="310"
       mnc="032"
       apn="VZWINTERNET"
@@ -7993,8 +7335,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="etex"
+  <apn carrier="etex"
       mcc="310"
       mnc="035"
       apn="CdmaNai"
@@ -8009,8 +7350,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Etex IMS"
+  <apn carrier="Etex IMS"
       mcc="310"
       mnc="035"
       apn="VZWIMS"
@@ -8021,8 +7361,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Etex IMS"
+  <apn carrier="Etex IMS"
       mcc="310"
       mnc="035"
       apn="VZWIMS"
@@ -8033,8 +7372,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Etex FOTA"
+  <apn carrier="Etex FOTA"
       mcc="310"
       mnc="035"
       apn="VZWADMIN"
@@ -8045,8 +7383,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Etex FOTA"
+  <apn carrier="Etex FOTA"
       mcc="310"
       mnc="035"
       apn="VZWADMIN"
@@ -8057,8 +7394,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Etex"
+  <apn carrier="Etex"
       mcc="310"
       mnc="035"
       apn="VZWINTERNET"
@@ -8072,8 +7408,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Etex"
+  <apn carrier="Etex"
       mcc="310"
       mnc="035"
       apn="VZWINTERNET"
@@ -8087,8 +7422,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="mta"
+  <apn carrier="mta"
       mcc="310"
       mnc="040"
       apn="CdmaNai"
@@ -8103,8 +7437,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Mta IMS"
+  <apn carrier="Mta IMS"
       mcc="310"
       mnc="040"
       apn="VZWIMS"
@@ -8115,8 +7448,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mta IMS"
+  <apn carrier="Mta IMS"
       mcc="310"
       mnc="040"
       apn="VZWIMS"
@@ -8127,8 +7459,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mta FOTA"
+  <apn carrier="Mta FOTA"
       mcc="310"
       mnc="040"
       apn="VZWADMIN"
@@ -8139,8 +7470,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mta FOTA"
+  <apn carrier="Mta FOTA"
       mcc="310"
       mnc="040"
       apn="VZWADMIN"
@@ -8151,8 +7481,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Mta"
+  <apn carrier="Mta"
       mcc="310"
       mnc="040"
       apn="VZWINTERNET"
@@ -8166,8 +7495,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Mta"
+  <apn carrier="Mta"
       mcc="310"
       mnc="040"
       apn="VZWINTERNET"
@@ -8181,8 +7509,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="alaskacomm"
+  <apn carrier="alaskacomm"
       mcc="310"
       mnc="050"
       apn="CdmaNai"
@@ -8197,8 +7524,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Alaskacomm IMS"
+  <apn carrier="Alaskacomm IMS"
       mcc="310"
       mnc="050"
       apn="VZWIMS"
@@ -8209,8 +7535,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Alaskacomm IMS"
+  <apn carrier="Alaskacomm IMS"
       mcc="310"
       mnc="050"
       apn="VZWIMS"
@@ -8221,8 +7546,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Alaskacomm FOTA"
+  <apn carrier="Alaskacomm FOTA"
       mcc="310"
       mnc="050"
       apn="VZWADMIN"
@@ -8233,8 +7557,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Alaskacomm FOTA"
+  <apn carrier="Alaskacomm FOTA"
       mcc="310"
       mnc="050"
       apn="VZWADMIN"
@@ -8245,8 +7568,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Alaskacomm"
+  <apn carrier="Alaskacomm"
       mcc="310"
       mnc="050"
       apn="VZWINTERNET"
@@ -8260,8 +7582,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Alaskacomm"
+  <apn carrier="Alaskacomm"
       mcc="310"
       mnc="050"
       apn="VZWINTERNET"
@@ -8274,8 +7595,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="U.S.Cellular"
+  <apn carrier="U.S.Cellular"
       mcc="310"
       mnc="066"
       apn="internet"
@@ -8285,8 +7605,7 @@
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
       mtu="1422"
   />
-  <apn
-      carrier="Corr Wap"
+  <apn carrier="Corr Wap"
       mcc="310"
       mnc="080"
       apn="corrgprs"
@@ -8295,8 +7614,7 @@
       port="9201"
       type="default"
   />
-  <apn
-      carrier="CorrMMS"
+  <apn carrier="CorrMMS"
       mcc="310"
       mnc="080"
       apn="corrmms"
@@ -8305,15 +7623,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="310"
       mnc="090"
       apn="isp"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="310"
       mnc="090"
       apn="mms"
@@ -8322,8 +7638,7 @@
       mmsport="3128"
       type="mms"
   />
-  <apn
-      carrier="Edge MMS Prepay"
+  <apn carrier="Edge MMS Prepay"
       mcc="310"
       mnc="090"
       apn="ppmms"
@@ -8332,8 +7647,7 @@
       mmsport="3128"
       type="mms"
   />
-  <apn
-      carrier="PLAT-OTA-MMS"
+  <apn carrier="PLAT-OTA-MMS"
       mcc="310"
       mnc="100"
       apn="plateaumms"
@@ -8343,15 +7657,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="PLATWEB"
+  <apn carrier="PLATWEB"
       mcc="310"
       mnc="100"
       apn="plateauweb"
       type="default,supl"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="310"
       mnc="120"
       apn="n.ispsn"
@@ -8362,16 +7674,14 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="310"
       mnc="120"
       apn="vowifi"
       type="ims"
       protocol="IP"
   />
-  <apn
-      carrier="My Multi Media"
+  <apn carrier="My Multi Media"
       mcc="310"
       mnc="130"
       apn="mms.c1.ama"
@@ -8380,8 +7690,7 @@
       mmsc="http://mms.iot1.com/amarillo/mms.php"
       type="mms"
   />
-  <apn
-      carrier="carolinawest"
+  <apn carrier="carolinawest"
       mcc="310"
       mnc="130"
       apn="CdmaNai"
@@ -8396,8 +7705,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Carolina IMS"
+  <apn carrier="Carolina IMS"
       mcc="310"
       mnc="130"
       apn="VZWIMS"
@@ -8408,8 +7716,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Carolina IMS"
+  <apn carrier="Carolina IMS"
       mcc="310"
       mnc="130"
       apn="VZWIMS"
@@ -8420,8 +7727,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Carolina FOTA"
+  <apn carrier="Carolina FOTA"
       mcc="310"
       mnc="130"
       apn="VZWADMIN"
@@ -8432,8 +7738,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Carolina FOTA"
+  <apn carrier="Carolina FOTA"
       mcc="310"
       mnc="130"
       apn="VZWADMIN"
@@ -8444,8 +7749,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Carolina west"
+  <apn carrier="Carolina west"
       mcc="310"
       mnc="130"
       apn="VZWINTERNET"
@@ -8459,8 +7763,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Carolina west"
+  <apn carrier="Carolina west"
       mcc="310"
       mnc="130"
       apn="VZWINTERNET"
@@ -8474,8 +7777,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Cricket"
+  <apn carrier="Cricket"
       mcc="310"
       mnc="150"
       apn="ndo"
@@ -8488,8 +7790,7 @@
       mmsport="80"
       type="default,mms,fota,hipri,supl"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="150"
       apn="ims"
@@ -8497,8 +7798,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="T-Mobile US 160"
+  <apn carrier="T-Mobile US 160"
       mcc="310"
       mnc="160"
       apn="epc.tmobile.com"
@@ -8506,8 +7806,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 160 DUN"
+  <apn carrier="T-Mobile US 160 DUN"
       mcc="310"
       mnc="160"
       apn="pcweb.tmobile.com"
@@ -8519,8 +7818,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 160"
+  <apn carrier="MetroPCS 160"
       mcc="310"
       mnc="160"
       apn="fast.metropcs.com"
@@ -8531,15 +7829,13 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="DataConnect"
+  <apn carrier="DataConnect"
       mcc="310"
       mnc="170"
       apn="isp.cingular"
       type="default,supl"
   />
-  <apn
-      carrier="Cingular MMS"
+  <apn carrier="Cingular MMS"
       mcc="310"
       mnc="170"
       apn="wap.cingular"
@@ -8550,8 +7846,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="WCW-INTERNET"
+  <apn carrier="WCW-INTERNET"
       mcc="310"
       mnc="180"
       apn="internet.wcc.net"
@@ -8559,8 +7854,7 @@
       password="mmsc"
       type="default"
   />
-  <apn
-      carrier="WCW-MMS"
+  <apn carrier="WCW-MMS"
       mcc="310"
       mnc="180"
       apn="mms.wcc.net"
@@ -8572,8 +7866,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile US 200"
+  <apn carrier="T-Mobile US 200"
       mcc="310"
       mnc="200"
       apn="epc.tmobile.com"
@@ -8581,8 +7874,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 200 DUN"
+  <apn carrier="T-Mobile US 200 DUN"
       mcc="310"
       mnc="200"
       apn="pcweb.tmobile.com"
@@ -8594,8 +7886,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 200"
+  <apn carrier="MetroPCS 200"
       mcc="310"
       mnc="200"
       apn="fast.metropcs.com"
@@ -8606,8 +7897,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US 210"
+  <apn carrier="T-Mobile US 210"
       mcc="310"
       mnc="210"
       apn="epc.tmobile.com"
@@ -8615,8 +7905,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 210 DUN"
+  <apn carrier="T-Mobile US 210 DUN"
       mcc="310"
       mnc="210"
       apn="pcweb.tmobile.com"
@@ -8628,8 +7917,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 210"
+  <apn carrier="MetroPCS 210"
       mcc="310"
       mnc="210"
       apn="fast.metropcs.com"
@@ -8640,8 +7928,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US 220"
+  <apn carrier="T-Mobile US 220"
       mcc="310"
       mnc="220"
       apn="epc.tmobile.com"
@@ -8649,8 +7936,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 220 DUN"
+  <apn carrier="T-Mobile US 220 DUN"
       mcc="310"
       mnc="220"
       apn="pcweb.tmobile.com"
@@ -8662,8 +7948,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 220"
+  <apn carrier="MetroPCS 220"
       mcc="310"
       mnc="220"
       apn="fast.metropcs.com"
@@ -8674,8 +7959,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US 230"
+  <apn carrier="T-Mobile US 230"
       mcc="310"
       mnc="230"
       apn="epc.tmobile.com"
@@ -8683,8 +7967,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 230 DUN"
+  <apn carrier="T-Mobile US 230 DUN"
       mcc="310"
       mnc="230"
       apn="pcweb.tmobile.com"
@@ -8696,8 +7979,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 230"
+  <apn carrier="MetroPCS 230"
       mcc="310"
       mnc="230"
       apn="fast.metropcs.com"
@@ -8708,8 +7990,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US 240"
+  <apn carrier="T-Mobile US 240"
       mcc="310"
       mnc="240"
       apn="epc.tmobile.com"
@@ -8717,8 +7998,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 240 DUN"
+  <apn carrier="T-Mobile US 240 DUN"
       mcc="310"
       mnc="240"
       apn="pcweb.tmobile.com"
@@ -8730,8 +8010,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 240"
+  <apn carrier="MetroPCS 240"
       mcc="310"
       mnc="240"
       apn="fast.metropcs.com"
@@ -8742,8 +8021,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US 250"
+  <apn carrier="T-Mobile US 250"
       mcc="310"
       mnc="250"
       apn="epc.tmobile.com"
@@ -8751,8 +8029,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 250 DUN"
+  <apn carrier="T-Mobile US 250 DUN"
       mcc="310"
       mnc="250"
       apn="pcweb.tmobile.com"
@@ -8764,8 +8041,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 250"
+  <apn carrier="MetroPCS 250"
       mcc="310"
       mnc="250"
       apn="fast.metropcs.com"
@@ -8776,43 +8052,44 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US"
+  <apn carrier="T-Mobile US"
       mcc="310"
       mnc="260"
       apn="fast.t-mobile.com"
       server="*"
-      protocol="IPV6"
-      roaming_protocol="IP"
-      type="default,supl"
+      mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      type="default,supl,mms"
       mtu="1440"
       user_editable="0"
+      bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|19|20"
   />
-  <apn
-      carrier="T-Mobile US 260 DUN"
+  <apn carrier="T-Mobile US 260 DUN"
       mcc="310"
       mnc="260"
       apn="pcweb.tmobile.com"
       user="none"
       server="*"
       password="none"
-      protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       type="dun"
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US"
+  <apn carrier="T-Mobile US"
       mcc="310"
       mnc="260"
       apn="tmus"
       server="*"
       mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
       type="mms"
-      protocol="IPV6"
-      roaming_protocol="IP"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
       mtu="1440"
       user_editable="0"
+      bearer_bitmask="18"
   />
   <apn
       carrier="Google Fi"
@@ -8829,8 +8106,7 @@
       mvno_match_data="31026097"
       mvno_type="IMSI"
   />
-  <apn
-      carrier="MetroPCS"
+  <apn carrier="MetroPCS"
       mcc="310"
       mnc="260"
       apn="fast.metropcs.com"
@@ -8841,8 +8117,7 @@
       mvno_type="gid"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS Tethering"
+  <apn carrier="MetroPCS Tethering"
       mcc="310"
       mnc="260"
       apn="pcweb.metropcs.com"
@@ -8856,8 +8131,7 @@
       mvno_type="gid"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS"
+  <apn carrier="MetroPCS"
       mcc="310"
       mnc="260"
       apn="tmus"
@@ -8870,19 +8144,17 @@
       mvno_match_data="6D"
       mvno_type="gid"
       mtu="1440"
-  />
-  <apn
-      carrier="TMobile (IMS)"
+ />
+  <apn carrier="TMobile (IMS)"
       mcc="310"
       mnc="260"
       apn="ims"
       type="ims"
-      protocol="IPV6"
+      protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS (IMS)"
+  <apn carrier="MetroPCS (IMS)"
       mcc="310"
       mnc="260"
       apn="ims"
@@ -8893,17 +8165,7 @@
       mvno_type="gid"
       user_editable="0"
   />
-  <apn
-      carrier="Simple"
-      mcc="310"
-      mnc="260"
-      apn="simple"
-      type="default,mms,supl"
-      protocol="IP"
-      mmsc="http://smpl.mms.msg.eng.t-mobile.com/mms/wapenc"
-  />
-  <apn
-      carrier="SIMPLE"
+  <apn carrier="SIMPLE"
       mcc="310"
       mnc="260"
       apn="simple"
@@ -8915,28 +8177,7 @@
       mvno_match_data="534D"
       user_editable="0"
   />
-  <apn
-      carrier="Straight Talk and Net 10"
-      mcc="310"
-      mnc="260"
-      apn="wap.tracfone"
-      mmsc="http://mms.tracfone.com"
-      type="default,supl, mms"
-      port="8080"
-      protocol="IP"
-  />
-  <apn
-      carrier="Tracfone"
-      mcc="310"
-      mnc="260"
-      apn="wap.tracfone"
-      port="8080"
-      type="default,mms,supl"
-      protocol="IP"
-      mmsc="http://mms-tf.net"
-  />
-  <apn
-      carrier="TFWAP"
+  <apn carrier="TFWAP"
       mcc="310"
       mnc="260"
       apn="wap.tracfone"
@@ -8948,8 +8189,7 @@
       mvno_match_data="deff"
       user_editable="0"
   />
-  <apn
-      carrier="TFWAP"
+  <apn carrier="TFWAP"
       mcc="310"
       mnc="260"
       apn="wap.tracfone"
@@ -8961,8 +8201,7 @@
       mvno_match_data="ddff"
       user_editable="0"
   />
-  <apn
-      carrier="Consumer Cellular"
+  <apn carrier="Consumer Cellular"
       mcc="310"
       mnc="260"
       apn="wholesale"
@@ -8978,8 +8217,7 @@
       mvno_match_data="2AC9"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 270"
+  <apn carrier="T-Mobile US 270"
       mcc="310"
       mnc="270"
       apn="epc.tmobile.com"
@@ -8987,8 +8225,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 270 DUN"
+  <apn carrier="T-Mobile US 270 DUN"
       mcc="310"
       mnc="270"
       apn="pcweb.tmobile.com"
@@ -9000,8 +8237,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 270"
+  <apn carrier="MetroPCS 270"
       mcc="310"
       mnc="270"
       apn="fast.metropcs.com"
@@ -9013,15 +8249,13 @@
       mvno_type="gid"
       user_editable="0"
   />
-  <apn
-      carrier="agms"
+  <apn carrier="agms"
       mcc="310"
       mnc="280"
       apn="agms"
       type="default,supl"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="280"
       apn="nxtgenphone"
@@ -9032,8 +8266,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="280"
       apn="ims"
@@ -9041,8 +8274,98 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="T-Mobile US 300"
+  <apn carrier="ATT Enhancedphone"
+      mcc="310"
+      mnc="280"
+      apn="enhancedphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Nrphone"
+      mcc="310"
+      mnc="280"
+      apn="nrphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
+      mcc="310"
+      mnc="280"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
+      mcc="310"
+      mnc="280"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="280"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="280"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Nextgenphone"
+      mcc="310"
+      mnc="280"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FFFF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="280"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FFFF"
+  />
+  <apn carrier="T-Mobile US 300"
       mcc="310"
       mnc="300"
       apn="fast.t-mobile.com"
@@ -9053,8 +8376,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 300 DUN"
+  <apn carrier="T-Mobile US 300 DUN"
       mcc="310"
       mnc="300"
       apn="pcweb.tmobile.com"
@@ -9066,8 +8388,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 300"
+  <apn carrier="MetroPCS 300"
       mcc="310"
       mnc="300"
       apn="fast.metropcs.com"
@@ -9079,22 +8400,19 @@
       mvno_type="gid"
       user_editable="0"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="310"
       mnc="30"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="310"
       mnc="300"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="T-Mobile US 310"
+  <apn carrier="T-Mobile US 310"
       mcc="310"
       mnc="310"
       apn="epc.tmobile.com"
@@ -9102,8 +8420,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 310 DUN"
+  <apn carrier="T-Mobile US 310 DUN"
       mcc="310"
       mnc="310"
       apn="pcweb.tmobile.com"
@@ -9115,8 +8432,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 310"
+  <apn carrier="MetroPCS 310"
       mcc="310"
       mnc="310"
       apn="fast.metropcs.com"
@@ -9128,15 +8444,13 @@
       mvno_type="gid"
       user_editable="0"
   />
-  <apn
-      carrier="Cellular One NEAZ ISP"
+  <apn carrier="Cellular One NEAZ ISP"
       mcc="310"
       mnc="320"
       apn="isp.cellularoneaz.net"
       type="default,supl"
   />
-  <apn
-      carrier="Cellular One ClearSky MMS"
+  <apn carrier="Cellular One ClearSky MMS"
       mcc="310"
       mnc="320"
       apn="wap.c1csky.net"
@@ -9145,8 +8459,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="alltel2"
+  <apn carrier="alltel2"
       mcc="310"
       mnc="330"
       apn="CdmaNai"
@@ -9161,8 +8474,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Alltel2 IMS"
+  <apn carrier="Alltel2 IMS"
       mcc="310"
       mnc="330"
       apn="VZWIMS"
@@ -9173,8 +8485,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Alltel2 IMS"
+  <apn carrier="Alltel2 IMS"
       mcc="310"
       mnc="330"
       apn="VZWIMS"
@@ -9185,8 +8496,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Alltel2 FOTA"
+  <apn carrier="Alltel2 FOTA"
       mcc="310"
       mnc="330"
       apn="VZWADMIN"
@@ -9197,8 +8507,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Alltel2 FOTA"
+  <apn carrier="Alltel2 FOTA"
       mcc="310"
       mnc="330"
       apn="VZWADMIN"
@@ -9209,8 +8518,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Alltel2"
+  <apn carrier="Alltel2"
       mcc="310"
       mnc="330"
       apn="VZWINTERNET"
@@ -9224,8 +8532,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Alltel2"
+  <apn carrier="Alltel2"
       mcc="310"
       mnc="330"
       apn="VZWINTERNET"
@@ -9239,8 +8546,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="pioneer"
+  <apn carrier="pioneer"
       mcc="310"
       mnc="360"
       apn="CdmaNai"
@@ -9255,8 +8561,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Pioneer IMS"
+  <apn carrier="Pioneer IMS"
       mcc="310"
       mnc="360"
       apn="VZWIMS"
@@ -9267,8 +8572,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Pioneer IMS"
+  <apn carrier="Pioneer IMS"
       mcc="310"
       mnc="360"
       apn="VZWIMS"
@@ -9279,8 +8583,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Pioneer FOTA"
+  <apn carrier="Pioneer FOTA"
       mcc="310"
       mnc="360"
       apn="VZWADMIN"
@@ -9291,8 +8594,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Pioneer FOTA"
+  <apn carrier="Pioneer FOTA"
       mcc="310"
       mnc="360"
       apn="VZWADMIN"
@@ -9303,8 +8605,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Pioneer"
+  <apn carrier="Pioneer"
       mcc="310"
       mnc="360"
       apn="VZWINTERNET"
@@ -9318,8 +8619,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Pioneer"
+  <apn carrier="Pioneer"
       mcc="310"
       mnc="360"
       apn="VZWINTERNET"
@@ -9333,8 +8633,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Cingular 380 ATT"
+  <apn carrier="Cingular 380 ATT"
       mcc="310"
       mnc="380"
       apn="proxy"
@@ -9342,8 +8641,7 @@
       mmsproxy="wireless.cingular.com"
       type="default,supl,mms"
   />
-  <apn
-      carrier="AWS MMS"
+  <apn carrier="AWS MMS"
       mcc="310"
       mnc="380"
       apn="proxy"
@@ -9352,8 +8650,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Celloneet MMS"
+  <apn carrier="Celloneet MMS"
       mcc="310"
       mnc="390"
       apn="mms.celloneet.com"
@@ -9364,8 +8661,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="ATT Enhancedphone"
+  <apn carrier="ATT Enhancedphone"
       mcc="310"
       mnc="410"
       apn="enhancedphone"
@@ -9377,8 +8673,7 @@
       mvno_type="gid"
       mvno_match_data="53FF"
   />
-  <apn
-      carrier="ATT Nrphone"
+  <apn carrier="ATT Nrphone"
       mcc="310"
       mnc="410"
       apn="nrphone"
@@ -9390,8 +8685,7 @@
       mvno_type="gid"
       mvno_match_data="52FF"
   />
-  <apn
-      carrier="ATT Nxtgenphone"
+  <apn carrier="ATT Nxtgenphone"
       mcc="310"
       mnc="410"
       apn="nxtgenphone"
@@ -9403,8 +8697,17 @@
       mvno_type="gid"
       mvno_match_data="52FF"
   />
-  <apn
-      carrier="ATT Nxtgenphone"
+  <apn carrier="ims"
+      mcc="310"
+      mnc="410"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
       mcc="310"
       mnc="410"
       apn="nxtgenphone"
@@ -9416,8 +8719,7 @@
       mvno_type="gid"
       mvno_match_data="53FF"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="410"
       apn="nxtgenphone"
@@ -9428,8 +8730,17 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
+      mcc="310"
+      mnc="410"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ims"
       mcc="310"
       mnc="410"
       apn="ims"
@@ -9439,8 +8750,7 @@
       mvno_type="gid"
       mvno_match_data="53FF"
   />
-  <apn
-      carrier="ATT Phone"
+  <apn carrier="ATT Phone"
       mcc="310"
       mnc="410"
       apn="phone"
@@ -9451,8 +8761,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="410"
       apn="nxtgenphone"
@@ -9465,8 +8774,7 @@
       mvno_type="gid"
       mvno_match_data="FFFF"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="410"
       apn="ims"
@@ -9476,8 +8784,7 @@
       mvno_type="gid"
       mvno_match_data="FFFF"
   />
-  <apn
-      carrier="ATT WAP"
+  <apn carrier="ATT WAP"
       mcc="310"
       mnc="410"
       apn="wap.cingular"
@@ -9488,8 +8795,7 @@
       mmsproxy="wireless.cingular.com"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Defense Mobile"
+  <apn carrier="Defense Mobile"
       mcc="310"
       mnc="410"
       apn="PRODATA"
@@ -9502,8 +8808,7 @@
       mvno_type="gid"
       mvno_match_data="60FF"
   />
-  <apn
-      carrier="Tracfone"
+  <apn carrier="Tracfone"
       mcc="310"
       mnc="410"
       apn="tfdata"
@@ -9513,8 +8818,7 @@
       mmsproxy="mms3.tracfone.com"
       mmsport="80"
   />
-  <apn
-      carrier="TFDATA"
+  <apn carrier="TFDATA"
       mcc="310"
       mnc="410"
       apn="tfdata"
@@ -9527,8 +8831,7 @@
       mvno_type="gid"
       mvno_match_data="deff"
   />
-  <apn
-      carrier="TFDATA"
+  <apn carrier="TFDATA"
       mcc="310"
       mnc="410"
       apn="tfdata"
@@ -9541,8 +8844,7 @@
       mvno_type="gid"
       mvno_match_data="ddff"
   />
-  <apn
-      carrier="Straight Talk"
+  <apn carrier="Straight Talk"
       mcc="310"
       mnc="410"
       apn="tfdata"
@@ -9551,8 +8853,7 @@
       mmsproxy="mms3.tracfone.com"
       mmsport="80"
   />
-  <apn
-      carrier="Net 10"
+  <apn carrier="Net 10"
       mcc="310"
       mnc="410"
       apn="tfdata"
@@ -9563,8 +8864,7 @@
       mmsproxy="mms3.tracfone.com"
       mmsport="80"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="410"
       apn="ims"
@@ -9572,8 +8872,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CBW Data"
+  <apn carrier="CBW Data"
       mcc="310"
       mnc="420"
       apn="wap.gocbw.com"
@@ -9582,8 +8881,7 @@
       mmsport="80"
       type="default,supl,mms"
   />
-  <apn
-      carrier="gci"
+  <apn carrier="gci"
       mcc="310"
       mnc="430"
       apn="CdmaNai"
@@ -9598,8 +8896,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Gci IMS"
+  <apn carrier="Gci IMS"
       mcc="310"
       mnc="430"
       apn="VZWIMS"
@@ -9610,8 +8907,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Gci IMS"
+  <apn carrier="Gci IMS"
       mcc="310"
       mnc="430"
       apn="VZWIMS"
@@ -9622,8 +8918,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Gci FOTA"
+  <apn carrier="Gci FOTA"
       mcc="310"
       mnc="430"
       apn="VZWADMIN"
@@ -9634,8 +8929,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Gci FOTA"
+  <apn carrier="Gci FOTA"
       mcc="310"
       mnc="430"
       apn="VZWADMIN"
@@ -9646,8 +8940,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Gci"
+  <apn carrier="Gci"
       mcc="310"
       mnc="430"
       apn="VZWINTERNET"
@@ -9661,8 +8954,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Gci"
+  <apn carrier="Gci"
       mcc="310"
       mnc="430"
       apn="VZWINTERNET"
@@ -9676,15 +8968,13 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Viaero Connect"
+  <apn carrier="Viaero Connect"
       mcc="310"
       mnc="450"
       apn="internet.vedge.com"
       type="default,supl"
   />
-  <apn
-      carrier="Viaero MMS"
+  <apn carrier="Viaero MMS"
       mcc="310"
       mnc="450"
       apn="mms"
@@ -9693,15 +8983,13 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="DataConnect"
+  <apn carrier="DataConnect"
       mcc="310"
       mnc="470"
       apn="isp.cingular"
       type="default,supl"
   />
-  <apn
-      carrier="MediaNet"
+  <apn carrier="MediaNet"
       mcc="310"
       mnc="470"
       apn="wap.cingular"
@@ -9712,8 +9000,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="nTelos Ota"
+  <apn carrier="nTelos Ota"
       mcc="310"
       mnc="470"
       apn="admin.4g.ntelos.com"
@@ -9723,8 +9010,7 @@
       server="*"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="nTelos Ota"
+  <apn carrier="nTelos Ota"
       mcc="310"
       mnc="470"
       apn="admin.4g.ntelos.com"
@@ -9734,8 +9020,7 @@
       server="*"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="nTelos Wireless"
+  <apn carrier="nTelos Wireless"
       mcc="310"
       mnc="470"
       apn="internet.4g.ntelos.com"
@@ -9744,8 +9029,7 @@
       server="*"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="nTelos Tether"
+  <apn carrier="nTelos Tether"
       mcc="310"
       mnc="470"
       apn="tethering.4g.ntelos.com"
@@ -9755,8 +9039,7 @@
       server="*"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="nTelos Tether"
+  <apn carrier="nTelos Tether"
       mcc="310"
       mnc="470"
       apn="tethering.4g.ntelos.com"
@@ -9766,8 +9049,7 @@
       server="*"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="nTelos Wireless"
+  <apn carrier="nTelos Wireless"
       mcc="310"
       mnc="470"
       apn="CdmaNai"
@@ -9782,15 +9064,13 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="DataConnect"
+  <apn carrier="DataConnect"
       mcc="310"
       mnc="480"
       apn="isp.cingular"
       type="default,supl"
   />
-  <apn
-      carrier="MediaNet"
+  <apn carrier="MediaNet"
       mcc="310"
       mnc="480"
       apn="wap.cingular"
@@ -9801,8 +9081,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="T-Mobile US 490"
+  <apn carrier="T-Mobile US 490"
       mcc="310"
       mnc="490"
       apn="epc.tmobile.com"
@@ -9810,8 +9089,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 490 DUN"
+  <apn carrier="T-Mobile US 490 DUN"
       mcc="310"
       mnc="490"
       apn="pcweb.tmobile.com"
@@ -9823,8 +9101,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 490"
+  <apn carrier="MetroPCS 490"
       mcc="310"
       mnc="490"
       apn="fast.metropcs.com"
@@ -9835,8 +9112,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="GoodCall Picture Message"
+  <apn carrier="GoodCall Picture Message"
       mcc="310"
       mnc="490"
       apn="good.call"
@@ -9845,8 +9121,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Suncom MMS"
+  <apn carrier="Suncom MMS"
       mcc="310"
       mnc="490"
       apn="mms"
@@ -9855,8 +9130,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile US 530"
+  <apn carrier="T-Mobile US 530"
       mcc="310"
       mnc="530"
       apn="fast.t-mobile.com"
@@ -9867,8 +9141,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 530 DUN"
+  <apn carrier="T-Mobile US 530 DUN"
       mcc="310"
       mnc="530"
       apn="pcweb.tmobile.com"
@@ -9880,8 +9153,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 530"
+  <apn carrier="MetroPCS 530"
       mcc="310"
       mnc="530"
       apn="fast.metropcs.com"
@@ -9892,8 +9164,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="DobsonMMS"
+  <apn carrier="DobsonMMS"
       mcc="310"
       mnc="560"
       apn="dobsoncellularwap"
@@ -9902,8 +9173,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="560"
       apn="nxtgenphone"
@@ -9914,8 +9184,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="560"
       apn="ims"
@@ -9923,15 +9192,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellular One Smartphone"
+  <apn carrier="Cellular One Smartphone"
       mcc="310"
       mnc="570"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cellular One MMS"
+  <apn carrier="Cellular One MMS"
       mcc="310"
       mnc="570"
       apn="clearsky"
@@ -9940,8 +9207,7 @@
       mmsport="9201"
       type="mms"
   />
-  <apn
-      carrier="ChinookMMS"
+  <apn carrier="ChinookMMS"
       mcc="310"
       mnc="570"
       apn="wapgw.chinookwireless.net"
@@ -9950,8 +9216,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile US 580"
+  <apn carrier="T-Mobile US 580"
       mcc="310"
       mnc="580"
       apn="epc.tmobile.com"
@@ -9959,8 +9224,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 580 DUN"
+  <apn carrier="T-Mobile US 580 DUN"
       mcc="310"
       mnc="580"
       apn="pcweb.tmobile.com"
@@ -9972,8 +9236,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 580"
+  <apn carrier="MetroPCS 580"
       mcc="310"
       mnc="580"
       apn="fast.metropcs.com"
@@ -9984,8 +9247,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="inland"
+  <apn carrier="inland"
       mcc="310"
       mnc="580"
       apn="CdmaNai"
@@ -10000,8 +9262,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Inland IMS"
+  <apn carrier="Inland IMS"
       mcc="310"
       mnc="580"
       apn="VZWIMS"
@@ -10012,8 +9273,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Inland IMS"
+  <apn carrier="Inland IMS"
       mcc="310"
       mnc="580"
       apn="VZWIMS"
@@ -10024,8 +9284,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Inland FOTA"
+  <apn carrier="Inland FOTA"
       mcc="310"
       mnc="580"
       apn="VZWADMIN"
@@ -10036,8 +9295,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Inland FOTA"
+  <apn carrier="Inland FOTA"
       mcc="310"
       mnc="580"
       apn="VZWADMIN"
@@ -10048,8 +9306,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Inland"
+  <apn carrier="Inland"
       mcc="310"
       mnc="580"
       apn="VZWINTERNET"
@@ -10063,8 +9320,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Inland"
+  <apn carrier="Inland"
       mcc="310"
       mnc="580"
       apn="VZWINTERNET"
@@ -10078,8 +9334,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="CellularOne MMS"
+  <apn carrier="CellularOne MMS"
       mcc="310"
       mnc="590"
       apn="cellular1wap"
@@ -10088,8 +9343,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile US 590"
+  <apn carrier="T-Mobile US 590"
       mcc="310"
       mnc="590"
       apn="fast.t-mobile.com"
@@ -10100,8 +9354,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 590 DUN"
+  <apn carrier="T-Mobile US 590 DUN"
       mcc="310"
       mnc="590"
       apn="pcweb.tmobile.com"
@@ -10113,8 +9366,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 590"
+  <apn carrier="MetroPCS 590"
       mcc="310"
       mnc="590"
       apn="fast.metropcs.com"
@@ -10125,8 +9377,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="cellcom"
+  <apn carrier="cellcom"
       mcc="310"
       mnc="600"
       apn="CdmaNai"
@@ -10141,8 +9392,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Cellcom IMS"
+  <apn carrier="Cellcom IMS"
       mcc="310"
       mnc="600"
       apn="VZWIMS"
@@ -10153,8 +9403,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Cellcom IMS"
+  <apn carrier="Cellcom IMS"
       mcc="310"
       mnc="600"
       apn="VZWIMS"
@@ -10165,8 +9414,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Cellcom FOTA"
+  <apn carrier="Cellcom FOTA"
       mcc="310"
       mnc="600"
       apn="VZWADMIN"
@@ -10177,8 +9425,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Cellcom FOTA"
+  <apn carrier="Cellcom FOTA"
       mcc="310"
       mnc="600"
       apn="VZWADMIN"
@@ -10189,8 +9436,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Cellcom"
+  <apn carrier="Cellcom"
       mcc="310"
       mnc="600"
       apn="VZWINTERNET"
@@ -10204,8 +9450,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Cellcom"
+  <apn carrier="Cellcom"
       mcc="310"
       mnc="600"
       apn="VZWINTERNET"
@@ -10219,15 +9464,13 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="EpicINT"
+  <apn carrier="EpicINT"
       mcc="310"
       mnc="610"
       apn="internet.epictouch"
       type="default,supl"
   />
-  <apn
-      carrier="EpicMMS"
+  <apn carrier="EpicMMS"
       mcc="310"
       mnc="610"
       apn="mms.epictouch"
@@ -10236,8 +9479,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile US 640"
+  <apn carrier="T-Mobile US 640"
       mcc="310"
       mnc="640"
       apn="fast.t-mobile.com"
@@ -10248,8 +9490,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 640 DUN"
+  <apn carrier="T-Mobile US 640 DUN"
       mcc="310"
       mnc="640"
       apn="pcweb.tmobile.com"
@@ -10260,8 +9501,7 @@
       type="dun"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 640"
+  <apn carrier="MetroPCS 640"
       mcc="310"
       mnc="640"
       apn="fast.metropcs.com"
@@ -10272,8 +9512,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="T-Mobile US 660"
+  <apn carrier="T-Mobile US 660"
       mcc="310"
       mnc="660"
       apn="epc.tmobile.com"
@@ -10281,8 +9520,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 660 DUN"
+  <apn carrier="T-Mobile US 660 DUN"
       mcc="310"
       mnc="660"
       apn="pcweb.tmobile.com"
@@ -10294,8 +9532,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 660"
+  <apn carrier="MetroPCS 660"
       mcc="310"
       mnc="660"
       apn="fast.metropcs.com"
@@ -10306,8 +9543,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="Rogers Internet"
+  <apn carrier="Rogers Internet"
       mcc="310"
       mnc="720"
       apn="internet.com"
@@ -10317,8 +9553,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Rogers Media"
+  <apn carrier="Rogers Media"
       mcc="310"
       mnc="720"
       apn="media.com"
@@ -10328,8 +9563,7 @@
       port="80"
       type="mms"
   />
-  <apn
-      carrier="appalachian"
+  <apn carrier="appalachian"
       mcc="310"
       mnc="750"
       apn="CdmaNai"
@@ -10344,8 +9578,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Appalachian IMS"
+  <apn carrier="Appalachian IMS"
       mcc="310"
       mnc="750"
       apn="VZWIMS"
@@ -10356,8 +9589,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Appalachian IMS"
+  <apn carrier="Appalachian IMS"
       mcc="310"
       mnc="750"
       apn="VZWIMS"
@@ -10368,8 +9600,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Appalachian FOTA"
+  <apn carrier="Appalachian FOTA"
       mcc="310"
       mnc="750"
       apn="VZWADMIN"
@@ -10380,8 +9611,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Appalachian FOTA"
+  <apn carrier="Appalachian FOTA"
       mcc="310"
       mnc="750"
       apn="VZWADMIN"
@@ -10392,8 +9622,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Appalachian"
+  <apn carrier="Appalachian"
       mcc="310"
       mnc="750"
       apn="VZWINTERNET"
@@ -10407,8 +9636,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Appalachian"
+  <apn carrier="Appalachian"
       mcc="310"
       mnc="750"
       apn="VZWINTERNET"
@@ -10422,15 +9650,13 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Web 2"
+  <apn carrier="Web 2"
       mcc="310"
       mnc="770"
       apn="i2.iwireless.com"
       type="default,supl"
   />
-  <apn
-      carrier="Web 1"
+  <apn carrier="Web 1"
       mcc="310"
       mnc="770"
       apn="wap1.iwireless.com"
@@ -10438,8 +9664,7 @@
       port="9401"
       type="default,supl"
   />
-  <apn
-      carrier="Picture Messaging"
+  <apn carrier="Picture Messaging"
       mcc="310"
       mnc="770"
       apn="wap1.iwireless.com"
@@ -10448,8 +9673,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="PIAPicture Messaging"
+  <apn carrier="PIAPicture Messaging"
       mcc="310"
       mnc="770"
       apn="wap9.iwireless.com"
@@ -10458,8 +9682,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="T-Mobile US 800"
+  <apn carrier="T-Mobile US 800"
       mcc="310"
       mnc="800"
       protocol="IPV6"
@@ -10470,8 +9693,7 @@
       type="default,supl,mms"
       user_editable="0"
   />
-  <apn
-      carrier="T-Mobile US 800 DUN"
+  <apn carrier="T-Mobile US 800 DUN"
       mcc="310"
       mnc="800"
       apn="pcweb.tmobile.com"
@@ -10483,8 +9705,7 @@
       mtu="1440"
       user_editable="0"
   />
-  <apn
-      carrier="MetroPCS 800"
+  <apn carrier="MetroPCS 800"
       mcc="310"
       mnc="800"
       apn="fast.metropcs.com"
@@ -10495,8 +9716,7 @@
       mvno_match_data="6D"
       mvno_type="gid"
   />
-  <apn
-      carrier="nepa"
+  <apn carrier="nepa"
       mcc="310"
       mnc="820"
       apn="CdmaNai"
@@ -10511,8 +9731,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Nepa IMS"
+  <apn carrier="Nepa IMS"
       mcc="310"
       mnc="820"
       apn="VZWIMS"
@@ -10523,8 +9742,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nepa IMS"
+  <apn carrier="Nepa IMS"
       mcc="310"
       mnc="820"
       apn="VZWIMS"
@@ -10535,8 +9753,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Nepa FOTA"
+  <apn carrier="Nepa FOTA"
       mcc="310"
       mnc="820"
       apn="VZWADMIN"
@@ -10547,8 +9764,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nepa FOTA"
+  <apn carrier="Nepa FOTA"
       mcc="310"
       mnc="820"
       apn="VZWADMIN"
@@ -10559,8 +9775,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Nepa"
+  <apn carrier="Nepa"
       mcc="310"
       mnc="820"
       apn="VZWINTERNET"
@@ -10574,8 +9789,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nepa"
+  <apn carrier="Nepa"
       mcc="310"
       mnc="820"
       apn="VZWINTERNET"
@@ -10589,15 +9803,13 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="310"
       mnc="840"
       apn="isp"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="310"
       mnc="840"
       apn="mms"
@@ -10606,8 +9818,7 @@
       mmsport="3128"
       type="mms"
   />
-  <apn
-      carrier="Edge MMS Prepay"
+  <apn carrier="Edge MMS Prepay"
       mcc="310"
       mnc="840"
       apn="ppmms"
@@ -10616,8 +9827,7 @@
       mmsport="3128"
       type="mms"
   />
-  <apn
-      carrier="DTC dtcwap"
+  <apn carrier="DTC dtcwap"
       mcc="310"
       mnc="880"
       apn="wapdtcw.com"
@@ -10625,16 +9835,14 @@
       proxy="204.181.155.218"
       port="8080"
   />
-  <apn
-      carrier="DTC MMS"
+  <apn carrier="DTC MMS"
       mcc="310"
       mnc="880"
       apn="mms.adv.com"
       mmsc="http://mms.iot1.com/advantage/mms.php"
       type="mms"
   />
-  <apn
-      carrier="midrivers"
+  <apn carrier="midrivers"
       mcc="310"
       mnc="900"
       apn="CdmaNai"
@@ -10649,8 +9857,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Midrivers IMS"
+  <apn carrier="Midrivers IMS"
       mcc="310"
       mnc="900"
       apn="VZWIMS"
@@ -10661,8 +9868,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Midrivers IMS"
+  <apn carrier="Midrivers IMS"
       mcc="310"
       mnc="900"
       apn="VZWIMS"
@@ -10673,8 +9879,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Midrivers FOTA"
+  <apn carrier="Midrivers FOTA"
       mcc="310"
       mnc="900"
       apn="VZWADMIN"
@@ -10685,8 +9890,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Midrivers FOTA"
+  <apn carrier="Midrivers FOTA"
       mcc="310"
       mnc="900"
       apn="VZWADMIN"
@@ -10697,8 +9901,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Midrivers"
+  <apn carrier="Midrivers"
       mcc="310"
       mnc="900"
       apn="VZWINTERNET"
@@ -10712,8 +9915,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Midrivers"
+  <apn carrier="Midrivers"
       mcc="310"
       mnc="900"
       apn="VZWINTERNET"
@@ -10727,8 +9929,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="WOW_WAP"
+  <apn carrier="WOW_WAP"
       mcc="310"
       mnc="910"
       apn="wap.firstcellular.com"
@@ -10737,8 +9938,7 @@
       mmsport="3128"
       type="default,supl,mms"
   />
-  <apn
-      carrier="jamesvalley"
+  <apn carrier="jamesvalley"
       mcc="310"
       mnc="920"
       apn="CdmaNai"
@@ -10753,8 +9953,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Jamesvalley IMS"
+  <apn carrier="Jamesvalley IMS"
       mcc="310"
       mnc="920"
       apn="VZWIMS"
@@ -10765,8 +9964,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Jamesvalley IMS"
+  <apn carrier="Jamesvalley IMS"
       mcc="310"
       mnc="920"
       apn="VZWIMS"
@@ -10777,8 +9975,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Jamesvalley FOTA"
+  <apn carrier="Jamesvalley FOTA"
       mcc="310"
       mnc="920"
       apn="VZWADMIN"
@@ -10789,8 +9986,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Jamesvalley FOTA"
+  <apn carrier="Jamesvalley FOTA"
       mcc="310"
       mnc="920"
       apn="VZWADMIN"
@@ -10801,8 +9997,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Jamesvalley"
+  <apn carrier="Jamesvalley"
       mcc="310"
       mnc="920"
       apn="VZWINTERNET"
@@ -10816,8 +10011,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Jamesvalley"
+  <apn carrier="Jamesvalley"
       mcc="310"
       mnc="920"
       apn="VZWINTERNET"
@@ -10831,8 +10025,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="coppervalley"
+  <apn carrier="coppervalley"
       mcc="310"
       mnc="930"
       apn="CdmaNai"
@@ -10847,8 +10040,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Coppervalley IMS"
+  <apn carrier="Coppervalley IMS"
       mcc="310"
       mnc="930"
       apn="VZWIMS"
@@ -10859,8 +10051,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Coppervalley IMS"
+  <apn carrier="Coppervalley IMS"
       mcc="310"
       mnc="930"
       apn="VZWIMS"
@@ -10871,8 +10062,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Coppervalley FOTA"
+  <apn carrier="Coppervalley FOTA"
       mcc="310"
       mnc="930"
       apn="VZWADMIN"
@@ -10883,8 +10073,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Coppervalley FOTA"
+  <apn carrier="Coppervalley FOTA"
       mcc="310"
       mnc="930"
       apn="VZWADMIN"
@@ -10895,8 +10084,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Copper Valley"
+  <apn carrier="Copper Valley"
       mcc="310"
       mnc="930"
       apn="VZWINTERNET"
@@ -10910,8 +10098,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Copper Valley"
+  <apn carrier="Copper Valley"
       mcc="310"
       mnc="930"
       apn="VZWINTERNET"
@@ -10925,8 +10112,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="310"
       mnc="950"
       apn="nxtgenphone"
@@ -10937,8 +10123,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="310"
       mnc="950"
       apn="ims"
@@ -10946,8 +10131,118 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="nntcwire"
+  <apn carrier="ims"
+      mcc="310"
+      mnc="950"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="950"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Enhancedphone"
+      mcc="310"
+      mnc="950"
+      apn="enhancedphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Nrphone"
+      mcc="310"
+      mnc="950"
+      apn="nrphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
+      mcc="310"
+      mnc="950"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
+      mcc="310"
+      mnc="950"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="950"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="950"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Nextgenphone"
+      mcc="310"
+      mnc="950"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FFFF"
+  />
+  <apn carrier="ims"
+      mcc="310"
+      mnc="950"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FFFF"
+  />
+  <apn carrier="nntcwire"
       mcc="310"
       mnc="960"
       apn="CdmaNai"
@@ -10962,8 +10257,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Nntcwire IMS"
+  <apn carrier="Nntcwire IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -10974,8 +10268,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nntcwire IMS"
+  <apn carrier="Nntcwire IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -10986,8 +10279,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Nntcwire FOTA"
+  <apn carrier="Nntcwire FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -10998,8 +10290,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nntcwire FOTA"
+  <apn carrier="Nntcwire FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11010,8 +10301,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Nntcwire"
+  <apn carrier="Nntcwire"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11025,8 +10315,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nntcwire"
+  <apn carrier="Nntcwire"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11040,8 +10329,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="silverstar"
+  <apn carrier="silverstar"
       mcc="310"
       mnc="960"
       apn="CdmaNai"
@@ -11056,8 +10344,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Silverstar IMS"
+  <apn carrier="Silverstar IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11068,8 +10355,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Silverstar IMS"
+  <apn carrier="Silverstar IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11080,8 +10366,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Silverstar FOTA"
+  <apn carrier="Silverstar FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11092,8 +10377,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Silverstar FOTA"
+  <apn carrier="Silverstar FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11104,8 +10388,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Silverstar"
+  <apn carrier="Silverstar"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11119,8 +10402,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Silverstar"
+  <apn carrier="Silverstar"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11134,8 +10416,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="snakeriver"
+  <apn carrier="snakeriver"
       mcc="310"
       mnc="960"
       apn="CdmaNai"
@@ -11150,8 +10431,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Snakeriver IMS"
+  <apn carrier="Snakeriver IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11162,8 +10442,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Snakeriver IMS"
+  <apn carrier="Snakeriver IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11174,8 +10453,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Snakeriver FOTA"
+  <apn carrier="Snakeriver FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11186,8 +10464,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Snakeriver FOTA"
+  <apn carrier="Snakeriver FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11198,8 +10475,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Snakeriver"
+  <apn carrier="Snakeriver"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11213,8 +10489,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Snakeriver"
+  <apn carrier="Snakeriver"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11228,8 +10503,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="southcentral"
+  <apn carrier="southcentral"
       mcc="310"
       mnc="960"
       apn="CdmaNai"
@@ -11244,8 +10518,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Southcentral IMS"
+  <apn carrier="Southcentral IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11256,8 +10529,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Southcentral IMS"
+  <apn carrier="Southcentral IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11268,8 +10540,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Southcentral FOTA"
+  <apn carrier="Southcentral FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11280,8 +10551,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Southcentral FOTA"
+  <apn carrier="Southcentral FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11292,8 +10562,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Southcentral"
+  <apn carrier="Southcentral"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11307,8 +10576,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Southcentral"
+  <apn carrier="Southcentral"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11322,8 +10590,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="strata"
+  <apn carrier="strata"
       mcc="310"
       mnc="960"
       apn="CdmaNai"
@@ -11338,8 +10605,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Strata IMS"
+  <apn carrier="Strata IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11350,8 +10616,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Strata IMS"
+  <apn carrier="Strata IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11362,8 +10627,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Strata FOTA"
+  <apn carrier="Strata FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11374,8 +10638,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Strata FOTA"
+  <apn carrier="Strata FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11386,8 +10649,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="strata"
+  <apn carrier="strata"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11401,8 +10663,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="strata"
+  <apn carrier="strata"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11416,8 +10677,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="syringa"
+  <apn carrier="syringa"
       mcc="310"
       mnc="960"
       apn="CdmaNai"
@@ -11432,8 +10692,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Syringa IMS"
+  <apn carrier="Syringa IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11444,8 +10703,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Syringa IMS"
+  <apn carrier="Syringa IMS"
       mcc="310"
       mnc="960"
       apn="VZWIMS"
@@ -11456,8 +10714,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Syringa FOTA"
+  <apn carrier="Syringa FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11468,8 +10725,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Syringa FOTA"
+  <apn carrier="Syringa FOTA"
       mcc="310"
       mnc="960"
       apn="VZWADMIN"
@@ -11480,8 +10736,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Syringa"
+  <apn carrier="Syringa"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11495,8 +10750,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Syringa"
+  <apn carrier="Syringa"
       mcc="310"
       mnc="960"
       apn="VZWINTERNET"
@@ -11510,8 +10764,8 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="thumbcellular"
+
+  <apn carrier="thumbcellular"
       mcc="311"
       mnc="050"
       apn="CdmaNai"
@@ -11526,8 +10780,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Thumb IMS"
+  <apn carrier="Thumb IMS"
       mcc="311"
       mnc="050"
       apn="VZWIMS"
@@ -11538,8 +10791,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Thumb IMS"
+  <apn carrier="Thumb IMS"
       mcc="311"
       mnc="050"
       apn="VZWIMS"
@@ -11550,8 +10802,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Thumb FOTA"
+  <apn carrier="Thumb FOTA"
       mcc="311"
       mnc="050"
       apn="VZWADMIN"
@@ -11562,8 +10813,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Thumb FOTA"
+  <apn carrier="Thumb FOTA"
       mcc="311"
       mnc="050"
       apn="VZWADMIN"
@@ -11574,8 +10824,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Thumbcellular"
+  <apn carrier="Thumbcellular"
       mcc="311"
       mnc="050"
       apn="VZWINTERNET"
@@ -11589,8 +10838,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Thumbcellular"
+  <apn carrier="Thumbcellular"
       mcc="311"
       mnc="050"
       apn="VZWINTERNET"
@@ -11604,8 +10852,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="elementmobile"
+  <apn carrier="elementmobile"
       mcc="311"
       mnc="070"
       apn="CdmaNai"
@@ -11620,8 +10867,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Elementmobile IMS"
+  <apn carrier="Elementmobile IMS"
       mcc="311"
       mnc="070"
       apn="VZWIMS"
@@ -11632,8 +10878,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Elementmobile IMS"
+  <apn carrier="Elementmobile IMS"
       mcc="311"
       mnc="070"
       apn="VZWIMS"
@@ -11644,8 +10889,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Elementmobile FOTA"
+  <apn carrier="Elementmobile FOTA"
       mcc="311"
       mnc="070"
       apn="VZWADMIN"
@@ -11656,8 +10900,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Elementmobile FOTA"
+  <apn carrier="Elementmobile FOTA"
       mcc="311"
       mnc="070"
       apn="VZWADMIN"
@@ -11668,8 +10911,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Elementmobile"
+  <apn carrier="Elementmobile"
       mcc="311"
       mnc="070"
       apn="VZWINTERNET"
@@ -11683,8 +10925,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Elementmobile"
+  <apn carrier="Elementmobile"
       mcc="311"
       mnc="070"
       apn="VZWINTERNET"
@@ -11698,18 +10939,16 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="PINE WAP"
-      mcc="311"
-      mnc="080"
-      apn="PINE"
-      mmsc="http://69.8.34.146/mms/"
-      mmsproxy="69.8.34.146"
-      mmsport="9401"
-      type="default,mms"
+  <apn carrier="PINE WAP"
+     mcc="311"
+     mnc="080"
+     apn="PINE"
+     mmsc="http://69.8.34.146/mms/"
+     mmsproxy="69.8.34.146"
+     mmsport="9401"
+     type="default,mms"
   />
-  <apn
-      carrier="NexTech Wireless"
+  <apn carrier="NexTech Wireless"
       mcc="311"
       mnc="100"
       authtype="3"
@@ -11718,8 +10957,7 @@
       server="*"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="sprocket"
+  <apn carrier="sprocket"
       mcc="311"
       mnc="140"
       apn="CdmaNai"
@@ -11734,8 +10972,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Sprocket IMS"
+  <apn carrier="Sprocket IMS"
       mcc="311"
       mnc="140"
       apn="VZWIMS"
@@ -11746,8 +10983,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Sprocket IMS"
+  <apn carrier="Sprocket IMS"
       mcc="311"
       mnc="140"
       apn="VZWIMS"
@@ -11758,8 +10994,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Sprocket FOTA"
+  <apn carrier="Sprocket FOTA"
       mcc="311"
       mnc="140"
       apn="VZWADMIN"
@@ -11770,8 +11005,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Sprocket FOTA"
+  <apn carrier="Sprocket FOTA"
       mcc="311"
       mnc="140"
       apn="VZWADMIN"
@@ -11782,8 +11016,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Sprocket"
+  <apn carrier="Sprocket"
       mcc="311"
       mnc="140"
       apn="VZWINTERNET"
@@ -11797,8 +11030,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Sprocket"
+  <apn carrier="Sprocket"
       mcc="311"
       mnc="140"
       apn="VZWINTERNET"
@@ -11812,8 +11044,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="ATT Nextgenphone"
+  <apn carrier="ATT Nextgenphone"
       mcc="311"
       mnc="180"
       apn="nxtgenphone"
@@ -11824,8 +11055,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="311"
       mnc="180"
       apn="ims"
@@ -11833,38 +11063,144 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ISP"
+  <apn carrier="ims"
+      mcc="311"
+      mnc="180"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ims"
+      mcc="311"
+      mnc="180"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Enhancedphone"
+      mcc="311"
+      mnc="180"
+      apn="enhancedphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Nrphone"
+      mcc="311"
+      mnc="180"
+      apn="nrphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
+      mcc="311"
+      mnc="180"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ATT Nxtgenphone"
+      mcc="311"
+      mnc="180"
+      apn="nxtgenphone"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      type="default,mms,fota,supl"
+      protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ims"
+      mcc="311"
+      mnc="180"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="52FF"
+  />
+  <apn carrier="ims"
+      mcc="311"
+      mnc="180"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="53FF"
+  />
+  <apn carrier="ATT Nextgenphone"
+      mcc="311"
+      mnc="180"
+      apn="nxtgenphone"
+      type="default,mms,supl,fota,hipri"
+      mmsc="http://mmsc.mobile.att.net"
+      mmsproxy="proxy.mobile.att.net"
+      mmsport="80"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FFFF"
+  />
+  <apn carrier="ims"
+      mcc="311"
+      mnc="180"
+      apn="ims"
+      type="ims"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      mvno_type="gid"
+      mvno_match_data="FFFF"
+  />
+  <apn carrier="ISP"
       mcc="311"
       mnc="190"
       apn="isp.cellular1.net"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="311"
       mnc="190"
       apn="wap.cellular1.net"
       mmsc="http://mms.cellular1.net/ecit/mms.php"
       type="mms"
   />
-  <apn
-      carrier="Farmers GPRS"
+  <apn carrier="Farmers GPRS"
       mcc="311"
       mnc="210"
       apn="internet.farmerswireless.com"
       type="default,supl"
   />
-  <apn
-      carrier="Farmers MMS"
+  <apn carrier="Farmers MMS"
       mcc="311"
       mnc="210"
       apn="mms.farmers.com"
       mmsc="172.16.0.37:8514"
       type="mms"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11875,8 +11211,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       apn="usccinternet"
@@ -11887,8 +11222,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       apn="usccinternet"
@@ -11899,8 +11233,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       apn="usccinternet"
@@ -11911,8 +11244,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       apn="usccinternet"
@@ -11922,8 +11254,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11934,8 +11265,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11946,8 +11276,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11958,8 +11287,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11970,8 +11298,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11982,8 +11309,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="220"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -11994,8 +11320,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12006,8 +11331,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12018,8 +11342,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12030,8 +11353,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12042,8 +11364,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12054,8 +11375,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12066,8 +11386,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12078,8 +11397,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="221"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12090,8 +11408,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       apn="usccinternet"
@@ -12102,8 +11419,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       apn="usccinternet"
@@ -12114,8 +11430,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12126,8 +11441,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12138,8 +11452,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12150,8 +11463,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12162,8 +11474,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12174,8 +11485,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="222"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12186,8 +11496,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       apn="usccinternet"
@@ -12198,8 +11507,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       apn="usccinternet"
@@ -12210,8 +11518,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12222,8 +11529,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12234,8 +11540,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12246,8 +11551,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12258,8 +11562,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12270,8 +11573,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="223"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12282,8 +11584,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       apn="usccinternet"
@@ -12294,8 +11595,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       apn="usccinternet"
@@ -12306,8 +11606,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12318,8 +11617,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12330,8 +11628,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12342,8 +11639,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12354,8 +11650,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12366,8 +11661,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="224"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12378,8 +11672,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12390,8 +11683,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12402,8 +11694,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12414,8 +11705,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12426,8 +11716,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12438,8 +11727,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12450,8 +11738,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       apn="usccinternet"
@@ -12463,8 +11750,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="225"
       apn="usccinternet"
@@ -12476,8 +11762,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       apn="usccinternet"
@@ -12488,8 +11773,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       apn="usccinternet"
@@ -12500,8 +11784,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12512,8 +11795,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12524,8 +11806,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12536,8 +11817,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12548,8 +11828,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12560,8 +11839,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="226"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12572,8 +11850,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       apn="usccinternet"
@@ -12584,8 +11861,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       apn="usccinternet"
@@ -12596,8 +11872,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12608,8 +11883,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12620,8 +11894,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12632,8 +11905,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12644,8 +11916,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12656,8 +11927,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="227"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12668,8 +11938,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       apn="usccinternet"
@@ -12680,8 +11949,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       apn="usccinternet"
@@ -12692,8 +11960,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12704,8 +11971,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12716,8 +11982,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12728,8 +11993,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12740,8 +12004,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12752,8 +12015,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="228"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12764,8 +12026,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       apn="usccinternet"
@@ -12776,8 +12037,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       apn="usccinternet"
@@ -12788,8 +12048,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12800,8 +12059,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12812,8 +12070,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12824,8 +12081,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12836,8 +12092,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12848,8 +12103,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="229"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -12860,8 +12114,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="CSpire ota"
+  <apn carrier="CSpire ota"
       mcc="311"
       mnc="230"
       apn="admin.cs4glte.com"
@@ -12873,8 +12126,7 @@
       bearer="14"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire ota"
+  <apn carrier="CSpire ota"
       mcc="311"
       mnc="230"
       apn="admin.cs4glte.com"
@@ -12886,8 +12138,7 @@
       bearer="13"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire internet"
+  <apn carrier="CSpire internet"
       mcc="311"
       mnc="230"
       apn="internet.cs4glte.com"
@@ -12898,8 +12149,7 @@
       type="default,internet,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire tether"
+  <apn carrier="CSpire tether"
       mcc="311"
       mnc="230"
       apn="tethering.cs4glte.com"
@@ -12911,8 +12161,7 @@
       bearer="13"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire tether"
+  <apn carrier="CSpire tether"
       mcc="311"
       mnc="230"
       apn="tethering.cs4glte.com"
@@ -12924,8 +12173,7 @@
       bearer="14"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="CSpire"
+  <apn carrier="CSpire"
       mcc="311"
       mnc="230"
       apn="CdmaNai"
@@ -12940,8 +12188,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="leaco"
+  <apn carrier="leaco"
       mcc="311"
       mnc="310"
       apn="CdmaNai"
@@ -12956,8 +12203,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Leaco IMS"
+  <apn carrier="Leaco IMS"
       mcc="311"
       mnc="310"
       apn="VZWIMS"
@@ -12968,8 +12214,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Leaco IMS"
+  <apn carrier="Leaco IMS"
       mcc="311"
       mnc="310"
       apn="VZWIMS"
@@ -12980,8 +12225,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Leaco FOTA"
+  <apn carrier="Leaco FOTA"
       mcc="311"
       mnc="310"
       apn="VZWADMIN"
@@ -12992,8 +12236,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Leaco FOTA"
+  <apn carrier="Leaco FOTA"
       mcc="311"
       mnc="310"
       apn="VZWADMIN"
@@ -13004,8 +12247,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Leaco"
+  <apn carrier="Leaco"
       mcc="311"
       mnc="310"
       apn="VZWINTERNET"
@@ -13019,8 +12261,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Leaco"
+  <apn carrier="Leaco"
       mcc="311"
       mnc="310"
       apn="VZWINTERNET"
@@ -13034,8 +12275,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="illinoisvalley"
+  <apn carrier="illinoisvalley"
       mcc="311"
       mnc="340"
       apn="CdmaNai"
@@ -13050,8 +12290,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Illinois IMS"
+  <apn carrier="Illinois IMS"
       mcc="311"
       mnc="340"
       apn="VZWIMS"
@@ -13062,8 +12301,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Illinois IMS"
+  <apn carrier="Illinois IMS"
       mcc="311"
       mnc="340"
       apn="VZWIMS"
@@ -13074,8 +12312,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Illinois FOTA"
+  <apn carrier="Illinois FOTA"
       mcc="311"
       mnc="340"
       apn="VZWADMIN"
@@ -13086,8 +12323,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Illinois FOTA"
+  <apn carrier="Illinois FOTA"
       mcc="311"
       mnc="340"
       apn="VZWADMIN"
@@ -13098,8 +12334,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Illinois valley"
+  <apn carrier="Illinois valley"
       mcc="311"
       mnc="340"
       apn="VZWINTERNET"
@@ -13113,8 +12348,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Illinois valley"
+  <apn carrier="Illinois valley"
       mcc="311"
       mnc="340"
       apn="VZWINTERNET"
@@ -13128,8 +12362,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="nemont"
+  <apn carrier="nemont"
       mcc="311"
       mnc="350"
       apn="CdmaNai"
@@ -13144,8 +12377,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Nemont IMS"
+  <apn carrier="Nemont IMS"
       mcc="311"
       mnc="350"
       apn="VZWIMS"
@@ -13156,8 +12388,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nemont IMS"
+  <apn carrier="Nemont IMS"
       mcc="311"
       mnc="350"
       apn="VZWIMS"
@@ -13168,8 +12399,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Nemont FOTA"
+  <apn carrier="Nemont FOTA"
       mcc="311"
       mnc="350"
       apn="VZWADMIN"
@@ -13180,8 +12410,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nemont FOTA"
+  <apn carrier="Nemont FOTA"
       mcc="311"
       mnc="350"
       apn="VZWADMIN"
@@ -13192,8 +12421,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Nemont"
+  <apn carrier="Nemont"
       mcc="311"
       mnc="350"
       apn="VZWINTERNET"
@@ -13207,8 +12435,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Nemont"
+  <apn carrier="Nemont"
       mcc="311"
       mnc="350"
       apn="VZWINTERNET"
@@ -13222,15 +12449,13 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="GCI WEB"
+  <apn carrier="GCI WEB"
       mcc="311"
       mnc="370"
       apn="web.gci"
       type="default,supl"
   />
-  <apn
-      carrier="GCI MMS"
+  <apn carrier="GCI MMS"
       mcc="311"
       mnc="370"
       apn="mms.gci"
@@ -13241,8 +12466,7 @@
       mmsport="9201"
       type="mms"
   />
-  <apn
-      carrier="ACS WEB"
+  <apn carrier="ACS WEB"
       mcc="311"
       mnc="370"
       apn="web.acs"
@@ -13250,8 +12474,7 @@
       mvno_match_data="3113702"
       mvno_type="imsi"
   />
-  <apn
-      carrier="ACS MMS"
+  <apn carrier="ACS MMS"
       mcc="311"
       mnc="370"
       apn="mms.acs"
@@ -13262,8 +12485,7 @@
       mvno_match_data="3113702"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Ericsson Test-SIM Internet"
+  <apn carrier="Ericsson Test-SIM Internet"
       mcc="311"
       mnc="390"
       apn="VZWINTERNET"
@@ -13277,8 +12499,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM Internet"
+  <apn carrier="Ericsson Test-SIM Internet"
       mcc="311"
       mnc="390"
       apn="VZWINTERNET"
@@ -13292,8 +12513,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM FOTA"
+  <apn carrier="Ericsson Test-SIM FOTA"
       mcc="311"
       mnc="390"
       apn="VZWADMIN"
@@ -13306,8 +12526,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM FOTA"
+  <apn carrier="Ericsson Test-SIM FOTA"
       mcc="311"
       mnc="390"
       apn="VZWADMIN"
@@ -13320,8 +12539,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM IMS"
+  <apn carrier="Ericsson Test-SIM IMS"
       mcc="311"
       mnc="390"
       apn="IMS"
@@ -13334,8 +12552,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM IMS"
+  <apn carrier="Ericsson Test-SIM IMS"
       mcc="311"
       mnc="390"
       apn="IMS"
@@ -13348,8 +12565,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM CBS"
+  <apn carrier="Ericsson Test-SIM CBS"
       mcc="311"
       mnc="390"
       apn="VZWAPP"
@@ -13363,8 +12579,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="Ericsson Test-SIM CBS"
+  <apn carrier="Ericsson Test-SIM CBS"
       mcc="311"
       mnc="390"
       apn="VZWAPP"
@@ -13378,8 +12593,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="chatmobrsa2"
+  <apn carrier="chatmobrsa2"
       mcc="311"
       mnc="410"
       apn="CdmaNai"
@@ -13394,8 +12608,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Chatmobrsa2 IMS"
+  <apn carrier="Chatmobrsa2 IMS"
       mcc="311"
       mnc="410"
       apn="VZWIMS"
@@ -13406,8 +12619,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobrsa2 IMS"
+  <apn carrier="Chatmobrsa2 IMS"
       mcc="311"
       mnc="410"
       apn="VZWIMS"
@@ -13418,8 +12630,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Chatmobrsa2 FOTA"
+  <apn carrier="Chatmobrsa2 FOTA"
       mcc="311"
       mnc="410"
       apn="VZWADMIN"
@@ -13430,8 +12641,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobrsa2 FOTA"
+  <apn carrier="Chatmobrsa2 FOTA"
       mcc="311"
       mnc="410"
       apn="VZWADMIN"
@@ -13442,8 +12652,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Chatmobrsa2"
+  <apn carrier="Chatmobrsa2"
       mcc="311"
       mnc="410"
       apn="VZWINTERNET"
@@ -13457,8 +12666,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobrsa2"
+  <apn carrier="Chatmobrsa2"
       mcc="311"
       mnc="410"
       apn="VZWINTERNET"
@@ -13472,8 +12680,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="northwestcell"
+  <apn carrier="northwestcell"
       mcc="311"
       mnc="420"
       apn="CdmaNai"
@@ -13488,8 +12695,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="NW IMS"
+  <apn carrier="NW IMS"
       mcc="311"
       mnc="420"
       apn="VZWIMS"
@@ -13500,8 +12706,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="NW IMS"
+  <apn carrier="NW IMS"
       mcc="311"
       mnc="420"
       apn="VZWIMS"
@@ -13512,8 +12717,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="NW FOTA"
+  <apn carrier="NW FOTA"
       mcc="311"
       mnc="420"
       apn="VZWADMIN"
@@ -13524,8 +12728,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="NW FOTA"
+  <apn carrier="NW FOTA"
       mcc="311"
       mnc="420"
       apn="VZWADMIN"
@@ -13536,8 +12739,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Northwestcell"
+  <apn carrier="Northwestcell"
       mcc="311"
       mnc="420"
       apn="VZWINTERNET"
@@ -13551,8 +12753,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Northwestcell"
+  <apn carrier="Northwestcell"
       mcc="311"
       mnc="420"
       apn="VZWINTERNET"
@@ -13566,8 +12767,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="chatmobrsa1"
+  <apn carrier="chatmobrsa1"
       mcc="311"
       mnc="430"
       apn="CdmaNai"
@@ -13582,8 +12782,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Chatmobrsa1 IMS"
+  <apn carrier="Chatmobrsa1 IMS"
       mcc="311"
       mnc="430"
       apn="VZWIMS"
@@ -13594,8 +12793,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobrsa1 IMS"
+  <apn carrier="Chatmobrsa1 IMS"
       mcc="311"
       mnc="430"
       apn="VZWIMS"
@@ -13606,8 +12804,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Chatmobrsa1 FOTA"
+  <apn carrier="Chatmobrsa1 FOTA"
       mcc="311"
       mnc="430"
       apn="VZWADMIN"
@@ -13618,8 +12815,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobrsa1 FOTA"
+  <apn carrier="Chatmobrsa1 FOTA"
       mcc="311"
       mnc="430"
       apn="VZWADMIN"
@@ -13630,8 +12826,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Chatmobrsa1"
+  <apn carrier="Chatmobrsa1"
       mcc="311"
       mnc="430"
       apn="VZWINTERNET"
@@ -13645,8 +12840,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobrsa1"
+  <apn carrier="Chatmobrsa1"
       mcc="311"
       mnc="430"
       apn="VZWINTERNET"
@@ -13660,8 +12854,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="bluegrass"
+  <apn carrier="bluegrass"
       mcc="311"
       mnc="440"
       apn="CdmaNai"
@@ -13676,8 +12869,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Bluegrass IMS"
+  <apn carrier="Bluegrass IMS"
       mcc="311"
       mnc="440"
       apn="VZWIMS"
@@ -13688,8 +12880,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Bluegrass IMS"
+  <apn carrier="Bluegrass IMS"
       mcc="311"
       mnc="440"
       apn="VZWIMS"
@@ -13700,8 +12891,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Bluegrass FOTA"
+  <apn carrier="Bluegrass FOTA"
       mcc="311"
       mnc="440"
       apn="VZWADMIN"
@@ -13712,8 +12902,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Bluegrass FOTA"
+  <apn carrier="Bluegrass FOTA"
       mcc="311"
       mnc="440"
       apn="VZWADMIN"
@@ -13724,8 +12913,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Bluegrass"
+  <apn carrier="Bluegrass"
       mcc="311"
       mnc="440"
       apn="VZWINTERNET"
@@ -13739,8 +12927,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Bluegrass"
+  <apn carrier="Bluegrass"
       mcc="311"
       mnc="440"
       apn="VZWINTERNET"
@@ -13754,8 +12941,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="ptci"
+  <apn carrier="ptci"
       mcc="311"
       mnc="450"
       apn="CdmaNai"
@@ -13770,8 +12956,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Ptci IMS"
+  <apn carrier="Ptci IMS"
       mcc="311"
       mnc="450"
       apn="VZWIMS"
@@ -13782,8 +12967,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Ptci IMS"
+  <apn carrier="Ptci IMS"
       mcc="311"
       mnc="450"
       apn="VZWIMS"
@@ -13794,8 +12978,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Ptci FOTA"
+  <apn carrier="Ptci FOTA"
       mcc="311"
       mnc="450"
       apn="VZWADMIN"
@@ -13806,8 +12989,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Ptci FOTA"
+  <apn carrier="Ptci FOTA"
       mcc="311"
       mnc="450"
       apn="VZWADMIN"
@@ -13818,8 +13000,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Ptci"
+  <apn carrier="Ptci"
       mcc="311"
       mnc="450"
       apn="VZWINTERNET"
@@ -13833,8 +13014,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Ptci"
+  <apn carrier="Ptci"
       mcc="311"
       mnc="450"
       apn="VZWINTERNET"
@@ -13848,8 +13028,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="311"
       mnc="480"
       apn="IMS"
@@ -13859,8 +13038,7 @@
       modem_cognitive="true"
       profile_id="2"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="311"
       mnc="480"
       apn="VZWADMIN"
@@ -13870,8 +13048,7 @@
       modem_cognitive="true"
       profile_id="3"
   />
-  <apn
-      carrier="Verizon"
+  <apn carrier="Verizon"
       mcc="311"
       mnc="480"
       apn="VZWINTERNET"
@@ -13881,8 +13058,16 @@
       modem_cognitive="true"
       profile_id="0"
   />
-  <apn
-      carrier="VZWAPP"
+  <apn carrier="Verizon Emergency"
+      mcc="311"
+      mnc="480"
+      apn="VZWEMERGENCY"
+      type="emergency"
+      protocol="IPV4V6"
+      roaming_protocol="IPV4V6"
+      user_editable="0"
+  />
+  <apn carrier="VZWAPP"
       mcc="311"
       mnc="480"
       apn="VZWAPP"
@@ -13894,8 +13079,7 @@
       modem_cognitive="true"
       profile_id="4"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -13908,8 +13092,7 @@
       type="default,mms"
       bearer="1"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -13922,8 +13105,7 @@
       type="default,mms"
       bearer="2"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -13936,8 +13118,7 @@
       type="default,mms"
       bearer="3"
   />
-  <apn
-      carrier="Sprint CdmaNai"
+  <apn carrier="Sprint CdmaNai"
       mcc="311"
       mnc="490"
       mmsproxy="68.28.31.2"
@@ -13949,8 +13130,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -13963,8 +13143,7 @@
       type="default,mms"
       bearer="9"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -13977,8 +13156,7 @@
       type="default,mms"
       bearer="10"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -13991,8 +13169,7 @@
       type="default,mms"
       bearer="11"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="otasn"
@@ -14001,8 +13178,7 @@
       protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="otasn"
@@ -14011,8 +13187,7 @@
       protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -14025,8 +13200,7 @@
       type="default,mms"
       bearer="15"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="490"
       apn="cinet.spcs"
@@ -14039,8 +13213,7 @@
       type="default,mms"
       bearer="16"
   />
-  <apn
-      carrier="24-7 WAP"
+  <apn carrier="24-7 WAP"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14050,8 +13223,7 @@
       mvno_type="spn"
       mvno_match_data="24-7 Wireless"
   />
-  <apn
-      carrier="24-7 WAP AT&amp;T"
+  <apn carrier="24-7 WAP AT&amp;T"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14061,8 +13233,7 @@
       mvno_type="spn"
       mvno_match_data="24-7 Wireless RPA"
   />
-  <apn
-      carrier="24-7 WAP T-Mobile"
+  <apn carrier="24-7 WAP T-Mobile"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14073,8 +13244,7 @@
       mvno_match_data="24-7 Wireless RPT"
       user_editable="0"
   />
-  <apn
-      carrier="24-7 WAP Other networks"
+  <apn carrier="24-7 WAP Other networks"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14084,8 +13254,7 @@
       mvno_type="spn"
       mvno_match_data="24-7 Wireless RPO"
   />
-  <apn
-      carrier="Mosaic WAP"
+  <apn carrier="Mosaic WAP"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14096,8 +13265,7 @@
       mvno_type="spn"
       mvno_match_data="Mosaic Mobile"
   />
-  <apn
-      carrier="Mosaic WAP AT&amp;T"
+  <apn carrier="Mosaic WAP AT&amp;T"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14108,8 +13276,7 @@
       mvno_type="spn"
       mvno_match_data="Mosaic RPA"
   />
-  <apn
-      carrier="Mosaic WAP T-Mobile"
+  <apn carrier="Mosaic WAP T-Mobile"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14121,8 +13288,7 @@
       mvno_match_data="Mosaic RPT"
       user_editable="0"
   />
-  <apn
-      carrier="Mosaic WAP Other networks"
+  <apn carrier="Mosaic WAP Other networks"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14133,8 +13299,7 @@
       mvno_type="spn"
       mvno_match_data="Mosaic RPO"
   />
-  <apn
-      carrier="Norvado"
+  <apn carrier="Norvado"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14145,8 +13310,7 @@
       mvno_type="spn"
       mvno_match_data="Norvado Wireless"
   />
-  <apn
-      carrier="Norvado AT&amp;T"
+  <apn carrier="Norvado AT&amp;T"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14157,8 +13321,7 @@
       mvno_type="spn"
       mvno_match_data="Norvado Wireless RPA"
   />
-  <apn
-      carrier="Norvado T-Mobile"
+  <apn carrier="Norvado T-Mobile"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14170,8 +13333,7 @@
       mvno_match_data="Norvado Wireless RPT"
       user_editable="0"
   />
-  <apn
-      carrier="Norvado Other networks"
+  <apn carrier="Norvado Other networks"
       mcc="311"
       mnc="500"
       apn="wap"
@@ -14182,8 +13344,7 @@
       mvno_type="spn"
       mvno_match_data="Norvado Wireless RPO"
   />
-  <apn
-      carrier="Blaze"
+  <apn carrier="Blaze"
       mcc="311"
       mnc="530"
       apn="mms.mymobiletxt.com"
@@ -14192,8 +13353,7 @@
       mvno_type="spn"
       mvno_match_data="Blaze Wireless"
   />
-  <apn
-      carrier="Duet Internet"
+  <apn carrier="Duet Internet"
       mcc="311"
       mnc="530"
       apn="wap.mymobiletxt.com"
@@ -14203,8 +13363,7 @@
       mmsproxy="172.16.16.102"
       mmsport="8080"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14215,8 +13374,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14227,8 +13385,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14239,8 +13396,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14251,8 +13407,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14263,8 +13418,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14275,8 +13429,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       apn="usccinternet"
@@ -14287,8 +13440,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="580"
       apn="usccinternet"
@@ -14299,8 +13451,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       apn="usccinternet"
@@ -14311,8 +13462,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       apn="usccinternet"
@@ -14323,8 +13473,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14335,8 +13484,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14347,8 +13495,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14359,8 +13506,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14371,8 +13517,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14383,8 +13528,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="581"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14395,8 +13539,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       apn="usccinternet"
@@ -14407,8 +13550,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       apn="usccinternet"
@@ -14419,8 +13561,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14431,8 +13572,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14443,8 +13583,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14455,8 +13594,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14467,8 +13605,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14479,8 +13616,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="582"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14491,8 +13627,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       apn="usccinternet"
@@ -14503,8 +13638,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       apn="usccinternet"
@@ -14515,8 +13649,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14527,8 +13660,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14539,8 +13671,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14551,8 +13682,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14563,8 +13693,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14575,8 +13704,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="583"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14587,8 +13715,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       apn="usccinternet"
@@ -14599,8 +13726,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       apn="usccinternet"
@@ -14611,8 +13737,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14623,8 +13748,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14635,8 +13759,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14647,8 +13770,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14659,8 +13781,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14671,8 +13792,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="584"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14683,8 +13803,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       apn="usccinternet"
@@ -14695,8 +13814,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       apn="usccinternet"
@@ -14707,8 +13825,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14719,8 +13836,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14731,8 +13847,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14743,8 +13858,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14755,8 +13869,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14767,8 +13880,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="585"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14779,8 +13891,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       apn="usccinternet"
@@ -14791,8 +13902,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       apn="usccinternet"
@@ -14803,8 +13913,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14815,8 +13924,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14827,8 +13935,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14839,8 +13946,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14851,8 +13957,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14863,8 +13968,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="586"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14875,8 +13979,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       apn="usccinternet"
@@ -14887,8 +13990,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       apn="usccinternet"
@@ -14899,8 +14001,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14911,8 +14012,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14923,8 +14023,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14935,8 +14034,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14947,8 +14045,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14959,8 +14056,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="587"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -14971,8 +14067,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       apn="usccinternet"
@@ -14983,8 +14078,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       apn="usccinternet"
@@ -14995,8 +14089,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15007,8 +14100,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15019,8 +14111,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15031,8 +14122,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15043,8 +14133,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15055,8 +14144,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="588"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15067,8 +14155,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       apn="usccinternet"
@@ -15079,8 +14166,7 @@
       bearer="13"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       apn="usccinternet"
@@ -15091,8 +14177,7 @@
       bearer="14"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15103,8 +14188,7 @@
       bearer="4"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15115,8 +14199,7 @@
       bearer="5"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15127,8 +14210,7 @@
       bearer="6"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15139,8 +14221,7 @@
       bearer="7"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15151,8 +14232,7 @@
       bearer="8"
       mtu="1422"
   />
-  <apn
-      carrier="U.S. Cellular"
+  <apn carrier="U.S. Cellular"
       mcc="311"
       mnc="589"
       mmsc="http://mmsc1.uscc.net/mmsc/MMS"
@@ -15163,8 +14243,7 @@
       bearer="12"
       mtu="1422"
   />
-  <apn
-      carrier="gsc"
+  <apn carrier="gsc"
       mcc="311"
       mnc="590"
       apn="CdmaNai"
@@ -15179,8 +14258,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Gsc IMS"
+  <apn carrier="Gsc IMS"
       mcc="311"
       mnc="590"
       apn="VZWIMS"
@@ -15191,8 +14269,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Gsc IMS"
+  <apn carrier="Gsc IMS"
       mcc="311"
       mnc="590"
       apn="VZWIMS"
@@ -15203,8 +14280,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Gsc FOTA"
+  <apn carrier="Gsc FOTA"
       mcc="311"
       mnc="590"
       apn="VZWADMIN"
@@ -15215,8 +14291,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Gsc FOTA"
+  <apn carrier="Gsc FOTA"
       mcc="311"
       mnc="590"
       apn="VZWADMIN"
@@ -15227,8 +14302,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Gsc"
+  <apn carrier="Gsc"
       mcc="311"
       mnc="590"
       apn="VZWINTERNET"
@@ -15242,8 +14316,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Gsc"
+  <apn carrier="Gsc"
       mcc="311"
       mnc="590"
       apn="VZWINTERNET"
@@ -15257,8 +14330,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="cox"
+  <apn carrier="cox"
       mcc="311"
       mnc="600"
       apn="CdmaNai"
@@ -15273,8 +14345,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Cox IMS"
+  <apn carrier="Cox IMS"
       mcc="311"
       mnc="600"
       apn="VZWIMS"
@@ -15285,8 +14356,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Cox IMS"
+  <apn carrier="Cox IMS"
       mcc="311"
       mnc="600"
       apn="VZWIMS"
@@ -15297,8 +14367,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Cox FOTA"
+  <apn carrier="Cox FOTA"
       mcc="311"
       mnc="600"
       apn="VZWADMIN"
@@ -15309,8 +14378,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Cox FOTA"
+  <apn carrier="Cox FOTA"
       mcc="311"
       mnc="600"
       apn="VZWADMIN"
@@ -15321,8 +14389,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Cox"
+  <apn carrier="Cox"
       mcc="311"
       mnc="600"
       apn="VZWINTERNET"
@@ -15336,8 +14403,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Cox"
+  <apn carrier="Cox"
       mcc="311"
       mnc="600"
       apn="VZWINTERNET"
@@ -15351,8 +14417,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="srtcomm"
+  <apn carrier="srtcomm"
       mcc="311"
       mnc="610"
       apn="CdmaNai"
@@ -15367,8 +14432,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Srtcomm IMS"
+  <apn carrier="Srtcomm IMS"
       mcc="311"
       mnc="610"
       apn="VZWIMS"
@@ -15379,8 +14443,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Srtcomm IMS"
+  <apn carrier="Srtcomm IMS"
       mcc="311"
       mnc="610"
       apn="VZWIMS"
@@ -15391,8 +14454,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Srtcomm FOTA"
+  <apn carrier="Srtcomm FOTA"
       mcc="311"
       mnc="610"
       apn="VZWADMIN"
@@ -15403,8 +14465,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Srtcomm FOTA"
+  <apn carrier="Srtcomm FOTA"
       mcc="311"
       mnc="610"
       apn="VZWADMIN"
@@ -15415,8 +14476,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Srtcomm"
+  <apn carrier="Srtcomm"
       mcc="311"
       mnc="610"
       apn="VZWINTERNET"
@@ -15430,8 +14490,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Srtcomm"
+  <apn carrier="Srtcomm"
       mcc="311"
       mnc="610"
       apn="VZWINTERNET"
@@ -15445,8 +14504,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="unitedwireless"
+  <apn carrier="unitedwireless"
       mcc="311"
       mnc="650"
       apn="CdmaNai"
@@ -15461,8 +14519,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="United IMS"
+  <apn carrier="United IMS"
       mcc="311"
       mnc="650"
       apn="VZWIMS"
@@ -15473,8 +14530,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="United IMS"
+  <apn carrier="United IMS"
       mcc="311"
       mnc="650"
       apn="VZWIMS"
@@ -15485,8 +14541,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="United FOTA"
+  <apn carrier="United FOTA"
       mcc="311"
       mnc="650"
       apn="VZWADMIN"
@@ -15497,8 +14552,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="United FOTA"
+  <apn carrier="United FOTA"
       mcc="311"
       mnc="650"
       apn="VZWADMIN"
@@ -15509,8 +14563,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Unitedwireless"
+  <apn carrier="Unitedwireless"
       mcc="311"
       mnc="650"
       apn="VZWINTERNET"
@@ -15524,8 +14577,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Unitedwireless"
+  <apn carrier="Unitedwireless"
       mcc="311"
       mnc="650"
       apn="VZWINTERNET"
@@ -15539,8 +14591,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="pinebelt"
+  <apn carrier="pinebelt"
       mcc="311"
       mnc="670"
       apn="CdmaNai"
@@ -15555,8 +14606,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Pinebelt IMS"
+  <apn carrier="Pinebelt IMS"
       mcc="311"
       mnc="670"
       apn="VZWIMS"
@@ -15567,8 +14617,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Pinebelt IMS"
+  <apn carrier="Pinebelt IMS"
       mcc="311"
       mnc="670"
       apn="VZWIMS"
@@ -15579,8 +14628,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Pinebelt FOTA"
+  <apn carrier="Pinebelt FOTA"
       mcc="311"
       mnc="670"
       apn="VZWADMIN"
@@ -15591,8 +14639,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Pinebelt FOTA"
+  <apn carrier="Pinebelt FOTA"
       mcc="311"
       mnc="670"
       apn="VZWADMIN"
@@ -15602,9 +14649,8 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-  />
-  <apn
-      carrier="Pinebelt"
+   />
+  <apn carrier="Pinebelt"
       mcc="311"
       mnc="670"
       apn="VZWINTERNET"
@@ -15618,8 +14664,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Pinebelt"
+  <apn carrier="Pinebelt"
       mcc="311"
       mnc="670"
       apn="VZWINTERNET"
@@ -15632,9 +14677,8 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
       bearer="14"
-  />
-  <apn
-      carrier="TelAlaska Cellular"
+   />
+  <apn carrier="TelAlaska Cellular"
       mcc="311"
       mnc="740"
       apn="akcell.mobi"
@@ -15642,8 +14686,7 @@
       protocol="IP"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15656,8 +14699,7 @@
       type="default,mms"
       bearer="1"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15670,8 +14712,7 @@
       type="default,mms"
       bearer="2"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15684,8 +14725,7 @@
       type="default,mms"
       bearer="3"
   />
-  <apn
-      carrier="Sprint CdmaNai"
+  <apn carrier="Sprint CdmaNai"
       mcc="311"
       mnc="870"
       mmsproxy="68.28.31.7"
@@ -15697,8 +14737,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15711,8 +14750,7 @@
       type="default,mms"
       bearer="9"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15725,8 +14763,7 @@
       type="default,mms"
       bearer="10"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15739,8 +14776,7 @@
       type="default,mms"
       bearer="11"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="otasn"
@@ -15748,8 +14784,7 @@
       protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="otasn"
@@ -15757,8 +14792,7 @@
       protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15771,8 +14805,7 @@
       type="default,mms"
       bearer="15"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="311"
       mnc="870"
       apn="cinet.spcs"
@@ -15785,8 +14818,7 @@
       type="default,mms"
       bearer="16"
   />
-  <apn
-      carrier="MobileNation"
+  <apn carrier="MobileNation"
       mcc="311"
       mnc="910"
       apn="mymn4g.net"
@@ -15797,8 +14829,7 @@
       type="default,internet,admin,fota,dun,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="charitonvalley"
+  <apn carrier="charitonvalley"
       mcc="311"
       mnc="920"
       apn="CdmaNai"
@@ -15813,8 +14844,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Chariton IMS"
+  <apn carrier="Chariton IMS"
       mcc="311"
       mnc="920"
       apn="VZWIMS"
@@ -15825,8 +14855,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chariton IMS"
+  <apn carrier="Chariton IMS"
       mcc="311"
       mnc="920"
       apn="VZWIMS"
@@ -15837,8 +14866,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Chariton FOTA"
+  <apn carrier="Chariton FOTA"
       mcc="311"
       mnc="920"
       apn="VZWADMIN"
@@ -15849,8 +14877,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chariton FOTA"
+  <apn carrier="Chariton FOTA"
       mcc="311"
       mnc="920"
       apn="VZWADMIN"
@@ -15861,8 +14888,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Chariton valley"
+  <apn carrier="Chariton valley"
       mcc="311"
       mnc="920"
       apn="VZWINTERNET"
@@ -15876,8 +14902,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chariton valley"
+  <apn carrier="Chariton valley"
       mcc="311"
       mnc="920"
       apn="VZWINTERNET"
@@ -15891,8 +14916,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Syringa Wireless"
+  <apn carrier="Syringa Wireless"
       mcc="311"
       mnc="930"
       apn="internet.syringawireless.com"
@@ -15903,8 +14927,8 @@
       type="default,internet,admin,fota,dun,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="custer"
+
+  <apn carrier="custer"
       mcc="312"
       mnc="040"
       apn="CdmaNai"
@@ -15919,8 +14943,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Custer IMS"
+  <apn carrier="Custer IMS"
       mcc="312"
       mnc="040"
       apn="VZWIMS"
@@ -15931,8 +14954,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Custer IMS"
+  <apn carrier="Custer IMS"
       mcc="312"
       mnc="040"
       apn="VZWIMS"
@@ -15943,8 +14965,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Custer FOTA"
+  <apn carrier="Custer FOTA"
       mcc="312"
       mnc="040"
       apn="VZWADMIN"
@@ -15955,8 +14976,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Custer FOTA"
+  <apn carrier="Custer FOTA"
       mcc="312"
       mnc="040"
       apn="VZWADMIN"
@@ -15967,8 +14987,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Custer"
+  <apn carrier="Custer"
       mcc="312"
       mnc="040"
       apn="VZWINTERNET"
@@ -15982,8 +15001,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Custer"
+  <apn carrier="Custer"
       mcc="312"
       mnc="040"
       apn="VZWINTERNET"
@@ -15997,8 +15015,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="chatmobility"
+  <apn carrier="chatmobility"
       mcc="312"
       mnc="160"
       apn="CdmaNai"
@@ -16013,8 +15030,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Chatmobility IMS"
+  <apn carrier="Chatmobility IMS"
       mcc="312"
       mnc="160"
       apn="VZWIMS"
@@ -16025,8 +15041,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Chatmobility IMS"
+  <apn carrier="Chatmobility IMS"
       mcc="312"
       mnc="160"
       apn="VZWIMS"
@@ -16037,8 +15052,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="chatmobility FOTA"
+  <apn carrier="chatmobility FOTA"
       mcc="312"
       mnc="160"
       apn="VZWADMIN"
@@ -16049,8 +15063,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="chatmobility FOTA"
+  <apn carrier="chatmobility FOTA"
       mcc="312"
       mnc="160"
       apn="VZWADMIN"
@@ -16061,8 +15074,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="chatmobility"
+  <apn carrier="chatmobility"
       mcc="312"
       mnc="160"
       apn="VZWINTERNET"
@@ -16076,8 +15088,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="chatmobility"
+  <apn carrier="chatmobility"
       mcc="312"
       mnc="160"
       apn="VZWINTERNET"
@@ -16091,8 +15102,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="NexTech Ota"
+  <apn carrier="NexTech Ota"
       mcc="312"
       mnc="420"
       apn="admin.lte.ntwls.com"
@@ -16104,8 +15114,7 @@
       bearer="14"
       protocol="IP"
   />
-  <apn
-      carrier="NexTech Ota"
+  <apn carrier="NexTech Ota"
       mcc="312"
       mnc="420"
       apn="admin.lte.ntwls.com"
@@ -16117,8 +15126,7 @@
       bearer="13"
       protocol="IP"
   />
-  <apn
-      carrier="NexTech Wireless"
+  <apn carrier="NexTech Wireless"
       mcc="312"
       mnc="420"
       apn="internet.lte.ntwls.com"
@@ -16129,8 +15137,7 @@
       type="default,internet,supl,hipri,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="NexTech Tether"
+  <apn carrier="NexTech Tether"
       mcc="312"
       mnc="420"
       apn="modem.lte.ntwls.com"
@@ -16142,8 +15149,7 @@
       bearer="14"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="NexTech Tether"
+  <apn carrier="NexTech Tether"
       mcc="312"
       mnc="420"
       apn="modem.lte.ntwls.com"
@@ -16155,8 +15161,7 @@
       bearer="13"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="Sprint CdmaNai"
+  <apn carrier="Sprint CdmaNai"
       mcc="312"
       mnc="530"
       mmsproxy="68.28.31.7"
@@ -16168,8 +15173,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16182,8 +15186,7 @@
       type="default,mms"
       bearer="1"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16196,8 +15199,7 @@
       type="default,mms"
       bearer="2"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16210,8 +15212,7 @@
       type="default,mms"
       bearer="3"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16224,8 +15225,7 @@
       type="default,mms"
       bearer="9"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16238,8 +15238,7 @@
       type="default,mms"
       bearer="10"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16252,8 +15251,7 @@
       type="default,mms"
       bearer="11"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16266,8 +15264,7 @@
       type="default,mms"
       bearer="15"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="cinet.spcs"
@@ -16280,8 +15277,7 @@
       type="default,mms"
       bearer="16"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="otasn"
@@ -16289,8 +15285,7 @@
       protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Sprint"
+  <apn carrier="Sprint"
       mcc="312"
       mnc="530"
       apn="otasn"
@@ -16298,8 +15293,7 @@
       protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Blue Wireless"
+  <apn carrier="Blue Wireless"
       mcc="312"
       mnc="570"
       apn="Blue Hotspot"
@@ -16312,8 +15306,7 @@
       type="default,dun,mms"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT FirstNet"
+  <apn carrier="ATT FirstNet"
       mcc="312"
       mnc="670"
       apn="firstnet-phone"
@@ -16324,8 +15317,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="312"
       mnc="670"
       apn="ims"
@@ -16333,8 +15325,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT FirstNet"
+  <apn carrier="ATT FirstNet"
       mcc="313"
       mnc="100"
       apn="firstnet-phone"
@@ -16345,8 +15336,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="313"
       mnc="100"
       apn="ims"
@@ -16354,8 +15344,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT FirstNet"
+  <apn carrier="ATT FirstNet"
       mcc="313"
       mnc="110"
       apn="firstnet-phone"
@@ -16366,8 +15355,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="313"
       mnc="110"
       apn="ims"
@@ -16375,8 +15363,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT FirstNet"
+  <apn carrier="ATT FirstNet"
       mcc="313"
       mnc="120"
       apn="firstnet-phone"
@@ -16387,8 +15374,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+    <apn carrier="ims"
       mcc="313"
       mnc="120"
       apn="ims"
@@ -16396,8 +15382,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT FirstNet"
+  <apn carrier="ATT FirstNet"
       mcc="313"
       mnc="130"
       apn="firstnet-phone"
@@ -16408,8 +15393,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+    <apn carrier="ims"
       mcc="313"
       mnc="130"
       apn="ims"
@@ -16417,8 +15401,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ATT FirstNet"
+  <apn carrier="ATT FirstNet"
       mcc="313"
       mnc="140"
       apn="firstnet-phone"
@@ -16429,8 +15412,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="ims"
+  <apn carrier="ims"
       mcc="313"
       mnc="140"
       apn="ims"
@@ -16438,8 +15420,23 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Sprint APN"
+  <apn carrier="5ginternet"
+       mcc="313"
+       mnc="340"
+       apn="5ginternet"
+       type="ia,default,supl,mms"
+       protocol="IPV4V6"
+       roaming_protocol="IPV4V6"
+  />
+  <apn carrier="ims"
+       mcc="313"
+       mnc="340"
+       apn="ims"
+       type="ims"
+       protocol="IPV4V6"
+       roaming_protocol="IPV4V6"
+  />
+  <apn carrier="Sprint APN"
       mcc="316"
       mnc="010"
       apn="cinet.spcs"
@@ -16451,8 +15448,8 @@
       mmsc="http://mms.sprintpcs.com"
       type="default"
   />
-  <apn
-      carrier="openmobile"
+
+  <apn carrier="openmobile"
       mcc="330"
       mnc="000"
       apn="CdmaNai"
@@ -16467,8 +15464,7 @@
       roaming_protocol="IPV4V6"
       bearer="6"
   />
-  <apn
-      carrier="Openmobile IMS"
+  <apn carrier="Openmobile IMS"
       mcc="330"
       mnc="000"
       apn="VZWIMS"
@@ -16479,8 +15475,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Openmobile IMS"
+  <apn carrier="Openmobile IMS"
       mcc="330"
       mnc="000"
       apn="VZWIMS"
@@ -16491,8 +15486,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Openmobile FOTA"
+  <apn carrier="Openmobile FOTA"
       mcc="330"
       mnc="000"
       apn="VZWADMIN"
@@ -16503,8 +15497,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Openmobile FOTA"
+  <apn carrier="Openmobile FOTA"
       mcc="330"
       mnc="000"
       apn="VZWADMIN"
@@ -16515,8 +15508,7 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="Openmobile"
+  <apn carrier="Openmobile"
       mcc="330"
       mnc="000"
       apn="VZWINTERNET"
@@ -16530,8 +15522,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="Openmobile"
+  <apn carrier="Openmobile"
       mcc="330"
       mnc="000"
       apn="VZWINTERNET"
@@ -16545,16 +15536,14 @@
       roaming_protocol="IPV4V6"
       bearer="14"
   />
-  <apn
-      carrier="INTERNET CLARO"
+  <apn carrier="INTERNET CLARO"
       mcc="330"
       mnc="110"
       apn="internet.claropr.com"
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS CLARO"
+  <apn carrier="MMS CLARO"
       mcc="330"
       mnc="110"
       apn="mms.claropr.com"
@@ -16564,8 +15553,8 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+
+  <apn carrier="Movistar INTERNET"
       mcc="334"
       mnc="03"
       apn="internet.movistar.mx"
@@ -16574,8 +15563,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="334"
       mnc="03"
       apn="wap.movistar.mx"
@@ -16585,8 +15573,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="334"
       mnc="03"
       apn="mms.movistar.mx"
@@ -16598,8 +15585,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="334"
       mnc="03"
       apn="ims"
@@ -16607,8 +15593,7 @@
       protocol="IP"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="334"
       mnc="020"
       apn="internet.itelcel.com"
@@ -16617,8 +15602,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Mensajes Multimedia"
+  <apn carrier="Mensajes Multimedia"
       mcc="334"
       mnc="020"
       apn="mms.itelcel.com"
@@ -16628,16 +15612,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Micro SIM"
+  <apn carrier="Micro SIM"
       apn="ba.amx"
       authtype="1"
       mcc="334"
       mnc="020"
       type="default"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="334"
       mnc="020"
       apn="ims"
@@ -16645,8 +15627,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="334"
       mnc="030"
       apn="internet.movistar.mx"
@@ -16655,8 +15636,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="334"
       mnc="030"
       apn="wap.movistar.mx"
@@ -16666,8 +15646,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="334"
       mnc="030"
       apn="mms.movistar.mx"
@@ -16679,8 +15658,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Iusacell Internet"
+  <apn carrier="Iusacell Internet"
       mcc="334"
       mnc="050"
       apn="web.iusacellgsm.mx"
@@ -16689,8 +15667,7 @@
       authtype="0"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Iusacell MMS"
+  <apn carrier="Iusacell MMS"
       mcc="334"
       mnc="050"
       apn="mms.iusacellgsm.mx"
@@ -16702,52 +15679,47 @@
       authtype="0"
       type="mms"
   />
-  <apn
-      carrier="Nextel Localización"
-      mcc="334"
-      mnc="090"
-      apn="location.nexteldata.com.mx"
-      server="http://supl.nexteldata.com.mx"
-      authtype="0"
-      type="supl"
-      port="7275"
+  <apn carrier='Nextel Localización'
+      mcc='334'
+      mnc='090'
+      apn='location.nexteldata.com.mx'
+      server='http://supl.nexteldata.com.mx'
+      authtype='0'
+      type='supl'
+      port='7275'
   />
-  <apn
-      carrier="Nextel MMS"
-      mcc="334"
-      mnc="090"
-      apn="mms.nexteldata.com.mx"
-      authtype="0"
-      mmsc="http://3gmms.nexteldata.com.mx"
-      mmsproxy="129.192.129.104"
-      mmsport="8080"
-      type="mms"
+  <apn carrier='Nextel MMS'
+      mcc='334'
+      mnc='090'
+      apn='mms.nexteldata.com.mx'
+      authtype='0'
+      mmsc='http://3gmms.nexteldata.com.mx'
+      mmsproxy='129.192.129.104'
+      mmsport='8080'
+      type='mms'
   />
-  <apn
-      carrier="Nextel Modem"
-      mcc="334"
-      mnc="090"
-      apn="modem.nexteldata.com.mx"
-      authtype="0"
-      type="dun"
+  <apn carrier='Nextel Modem'
+      mcc='334'
+      mnc='090'
+      apn='modem.nexteldata.com.mx'
+      authtype='0'
+      type='dun'
   />
-  <apn
-      carrier="Nextel Navegación"
-      mcc="334"
-      mnc="090"
-      apn="wap.nexteldata.com.mx"
-      authtype="0"
-      type="default"
+  <apn carrier='Nextel Navegación'
+      mcc='334'
+      mnc='090'
+      apn='wap.nexteldata.com.mx'
+      authtype='0'
+      type='default'
   />
-  <apn
-      carrier="INTERNET Digicel"
+
+  <apn carrier="INTERNET Digicel"
       mcc="338"
       mnc="05"
       apn="web"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Digicel"
+  <apn carrier="MMS Digicel"
       mcc="338"
       mnc="05"
       apn="wap"
@@ -16756,16 +15728,14 @@
       mmsc="http://mms.digicelgroup.com"
       type="mms"
   />
-  <apn
-      carrier="INTERNET Digicel"
+  <apn carrier="INTERNET Digicel"
       mcc="338"
       mnc="050"
       apn="web.digiceljamaica.com"
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS Digicel"
+  <apn carrier="MMS Digicel"
       mcc="338"
       mnc="050"
       apn="wap"
@@ -16775,16 +15745,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+  <apn carrier="Lime Internet Postpaid"
       mcc="338"
       mnc="18"
       apn="internet"
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="338"
       mnc="18"
       apn="multimedia"
@@ -16794,15 +15762,13 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Prepaid"
+  <apn carrier="Lime Internet Prepaid"
       mcc="338"
       mnc="18"
       apn="ppinternet"
       type="default,supl"
   />
-  <apn
-      carrier="Lime Prepaid MMS"
+  <apn carrier="Lime Prepaid MMS"
       mcc="338"
       mnc="18"
       apn="ppmms"
@@ -16811,8 +15777,7 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Claro Web"
+  <apn carrier="Claro Web"
       mcc="338"
       mnc="070"
       apn="internet.ideasclaro.com.jm"
@@ -16821,8 +15786,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Claro MMS"
+  <apn carrier="Claro MMS"
       mcc="338"
       mnc="070"
       apn="mms.ideasclaro.com.jm"
@@ -16834,15 +15798,13 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+  <apn carrier="Lime Internet Postpaid"
       mcc="338"
       mnc="180"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="338"
       mnc="180"
       apn="multimedia"
@@ -16851,15 +15813,13 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Prepaid"
+  <apn carrier="Lime Internet Prepaid"
       mcc="338"
       mnc="180"
       apn="ppinternet"
       type="default,supl"
   />
-  <apn
-      carrier="Lime Prepaid MMS"
+  <apn carrier="Lime Prepaid MMS"
       mcc="338"
       mnc="180"
       apn="ppmms"
@@ -16868,8 +15828,7 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+  <apn carrier="Lime Internet Postpaid"
       mcc="338"
       mnc="180"
       apn="internet"
@@ -16878,8 +15837,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="338"
       mnc="180"
       apn="multimedia"
@@ -16891,8 +15849,8 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Orange World Caraïbe"
+
+  <apn carrier="Orange World Caraïbe"
       mcc="340"
       mnc="01"
       apn="orangewap"
@@ -16902,8 +15860,7 @@
       port="8082"
       type="default,supl"
   />
-  <apn
-      carrier="Orangeweb"
+  <apn carrier="Orangeweb"
       mcc="340"
       mnc="01"
       apn="orangeweb"
@@ -16911,8 +15868,7 @@
       password="orange"
       type="default"
   />
-  <apn
-      carrier="Orange MMS Caraïbe"
+  <apn carrier="Orange MMS Caraïbe"
       mcc="340"
       mnc="01"
       apn="orangewap"
@@ -16923,8 +15879,7 @@
       mmsport="8082"
       type="mms"
   />
-  <apn
-      carrier="Digicel FR"
+  <apn carrier="Digicel FR"
       mcc="340"
       mnc="20"
       apn="wap.digicelfr.com"
@@ -16935,8 +15890,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+  <apn carrier="Lime Internet Postpaid"
       mcc="342"
       mnc="60"
       apn="internet"
@@ -16944,8 +15898,7 @@
       password=""
       type="default,supl"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="342"
       mnc="60"
       apn="multimedia"
@@ -16956,17 +15909,15 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Barbado:Lime:Internet"
-      mcc="342"
-      mnc="600"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Barbado:Lime:Internet'
+      mcc='342'
+      mnc='600'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Barbados:Lime:Mms"
+  <apn carrier="Barbados:Lime:Mms"
       mcc="342"
       mnc="600"
       apn="multimedia"
@@ -16976,17 +15927,16 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Barbado:Lime:Modem"
-      mcc="342"
-      mnc="600"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Barbado:Lime:Modem'
+      mcc='342'
+      mnc='600'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="344"
       mnc="92"
       apn="internet"
@@ -16994,8 +15944,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="344"
       mnc="92"
       apn="multimedia"
@@ -17006,37 +15955,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Antigua:Lime:Internet"
-      mcc="344"
-      mnc="920"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Antigua:Lime:Internet'
+      mcc='344'
+      mnc='920'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Antigua:Lime:Mms"
-      mcc="344"
-      mnc="920"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Antigua:Lime:Mms'
+      mcc='344'
+      mnc='920'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Antigua:Lime:Modem"
-      mcc="344"
-      mnc="920"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Antigua:Lime:Modem'
+      mcc='344'
+      mnc='920'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="346"
       mnc="14"
       apn="internet"
@@ -17044,8 +15990,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="346"
       mnc="14"
       apn="multimedia"
@@ -17056,37 +16001,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Cayman Islands:Lime:Internet"
-      mcc="346"
-      mnc="140"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Cayman Islands:Lime:Internet'
+      mcc='346'
+      mnc='140'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Cayman Islands:Lime:Modem"
-      mcc="346"
-      mnc="140"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Cayman Islands:Lime:Modem'
+      mcc='346'
+      mnc='140'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Cayman Islands:Mms"
-      mcc="346"
-      mnc="140"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Cayman Islands:Mms'
+      mcc='346'
+      mnc='140'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="348"
       mnc="17"
       apn="internet"
@@ -17094,8 +16036,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="348"
       mnc="17"
       apn="multimedia"
@@ -17106,71 +16047,65 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Bvi:Digicel:Internet"
-      mcc="348"
-      mnc="77"
-      apn="wap.digicelbvi.com"
-      authtype="1"
-      type="default"
+  <apn carrier='Bvi:Digicel:Internet'
+      mcc='348'
+      mnc='77'
+      apn='wap.digicelbvi.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Bvi:Digicel:Mms"
-      mcc="348"
-      mnc="77"
-      apn="wap.digicelbvi.com"
-      authtype="1"
-      mmsc="http://mmc.digiceljamaica.com/servlets/mms"
-      mmsproxy="172.16.7.12"
-      mmsport="9201"
-      type="mms"
-      user="wapbvi"
-      password="wapbvi"
+  <apn carrier='Bvi:Digicel:Mms'
+      mcc='348'
+      mnc='77'
+      apn='wap.digicelbvi.com'
+      authtype='1'
+      mmsc='http://mmc.digiceljamaica.com/servlets/mms'
+      mmsproxy='172.16.7.12'
+      mmsport='9201'
+      type='mms'
+      user='wapbvi'
+      password='wapbvi'
   />
-  <apn
-      carrier="Bvi:Digicel:Modem"
-      mcc="348"
-      mnc="77"
-      apn="wap.digicelbvi.com"
-      port="8080"
-      authtype="1"
-      proxy="172.16.7.12"
-      mmsc="http://wapdigicel.com"
-      type="dun"
-      user="wapbvi"
-      password="wapbvi"
+  <apn carrier='Bvi:Digicel:Modem'
+      mcc='348'
+      mnc='77'
+      apn='wap.digicelbvi.com'
+      port='8080'
+      authtype='1'
+      proxy='172.16.7.12'
+      mmsc='http://wapdigicel.com'
+      type='dun'
+      user='wapbvi'
+      password='wapbvi'
   />
-  <apn
-      carrier="Bvi:Lime:Internet"
-      mcc="348"
-      mnc="170"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Bvi:Lime:Internet'
+      mcc='348'
+      mnc='170'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Bvi:Lime:Mms"
-      mcc="348"
-      mnc="170"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Bvi:Lime:Mms'
+      mcc='348'
+      mnc='170'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Bvi:Lime:Modem"
-      mcc="348"
-      mnc="170"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Bvi:Lime:Modem'
+      mcc='348'
+      mnc='170'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="352"
       mnc="11"
       apn="internet"
@@ -17178,8 +16113,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="352"
       mnc="11"
       apn="multimedia"
@@ -17190,37 +16124,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Grenada:Lime:Internet"
-      mcc="352"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Grenada:Lime:Internet'
+      mcc='352'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Grenada:Lime:Mms"
-      mcc="352"
-      mnc="110"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Grenada:Lime:Mms'
+      mcc='352'
+      mnc='110'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Grenada:Lime:Modem"
-      mcc="352"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Grenada:Lime:Modem'
+      mcc='352'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="354"
       mnc="86"
       apn="internet"
@@ -17228,8 +16159,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="354"
       mnc="86"
       apn="multimedia"
@@ -17240,37 +16170,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Monserrat:Lime:Internet"
-      mcc="354"
-      mnc="860"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Monserrat:Lime:Internet'
+      mcc='354'
+      mnc='860'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Monserrat:Lime:Mms"
-      mcc="354"
-      mnc="860"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Monserrat:Lime:Mms'
+      mcc='354'
+      mnc='860'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Monserrat:Lime:Modem"
-      mcc="354"
-      mnc="860"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Monserrat:Lime:Modem'
+      mcc='354'
+      mnc='860'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="356"
       mnc="11"
       apn="internet"
@@ -17278,8 +16205,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="356"
       mnc="11"
       apn="multimedia"
@@ -17290,37 +16216,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="St Kitts And Nevis:Lime:Internet"
-      mcc="356"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='St Kitts And Nevis:Lime:Internet'
+      mcc='356'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="St Kitts And Nevis:Lime:Mms"
-      mcc="356"
-      mnc="110"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='St Kitts And Nevis:Lime:Mms'
+      mcc='356'
+      mnc='110'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="St Kitts And Nevis:Lime:Modem"
-      mcc="356"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='St Kitts And Nevis:Lime:Modem'
+      mcc='356'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="358"
       mnc="11"
       apn="internet"
@@ -17328,8 +16251,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="358"
       mnc="11"
       apn="multimedia"
@@ -17340,37 +16262,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="St Lucia:Lime:Internet"
-      mcc="358"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='St Lucia:Lime:Internet'
+      mcc='358'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="St Lucia:Lime:Mms"
-      mcc="358"
-      mnc="110"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='St Lucia:Lime:Mms'
+      mcc='358'
+      mnc='110'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="St Lucia:Lime:Modem"
-      mcc="358"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='St Lucia:Lime:Modem'
+      mcc='358'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="360"
       mnc="11"
       apn="internet"
@@ -17378,8 +16297,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="360"
       mnc="11"
       apn="multimedia"
@@ -17390,67 +16308,62 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="St Vincent:Lime:Internet"
-      mcc="360"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='St Vincent:Lime:Internet'
+      mcc='360'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="St Vincent:Lime:Mms"
-      mcc="360"
-      mnc="110"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='St Vincent:Lime:Mms'
+      mcc='360'
+      mnc='110'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="St Vincent:Lime:Modem"
-      mcc="360"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='St Vincent:Lime:Modem'
+      mcc='360'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Curacao:Digicel:Internet"
-      mcc="362"
-      mnc="69"
-      apn="web.digicelcuracao.com"
-      authtype="1"
-      type="default"
+
+  <apn carrier='Curacao:Digicel:Internet'
+      mcc='362'
+      mnc='69'
+      apn='web.digicelcuracao.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Curacao:Digicel:Mms"
-      mcc="362"
-      mnc="69"
-      apn="wap"
-      authtype="1"
-      mmsc="http://mms.digicelgroup.com"
-      mmsproxy="172.16.7.12"
-      mmsport="9201"
-      type="mms"
+  <apn carrier='Curacao:Digicel:Mms'
+      mcc='362'
+      mnc='69'
+      apn='wap'
+      authtype='1'
+      mmsc='http://mms.digicelgroup.com'
+      mmsproxy='172.16.7.12'
+      mmsport='9201'
+      type='mms'
   />
-  <apn
-      carrier="Curacao:Digicel:Modem"
-      mcc="362"
-      mnc="69"
-      apn="wap"
-      port="8080"
-      authtype="1"
-      proxy="172.16.7.12"
-      mmsc="http://wapdigicel.com"
-      type="dun"
+  <apn carrier='Curacao:Digicel:Modem'
+      mcc='362'
+      mnc='69'
+      apn='wap'
+      port='8080'
+      authtype='1'
+      proxy='172.16.7.12'
+      mmsc='http://wapdigicel.com'
+      type='dun'
   />
-  <apn
-      carrier="INTERNET Aruba"
+
+  <apn carrier="INTERNET Aruba"
       mcc="363"
       mnc="02"
       apn="web.digicelaruba.com"
@@ -17459,8 +16372,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS Digicel"
+  <apn carrier="MMS Digicel"
       mcc="363"
       mnc="02"
       apn="wap"
@@ -17472,8 +16384,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="INTERNET Aruba"
+ <apn carrier="INTERNET Aruba"
       mcc="363"
       mnc="020"
       apn="web.digicelaruba.com"
@@ -17482,8 +16393,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Digicel"
+  <apn carrier="MMS Digicel"
       mcc="363"
       mnc="020"
       apn="wap"
@@ -17495,8 +16405,8 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="365"
       mnc="84"
       apn="internet"
@@ -17504,8 +16414,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="365"
       mnc="84"
       apn="multimedia"
@@ -17516,37 +16425,34 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Anguilla:Lime:Internet"
-      mcc="365"
-      mnc="840"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+  <apn carrier='Anguilla:Lime:Internet'
+      mcc='365'
+      mnc='840'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
   />
-  <apn
-      carrier="Anguilla:Lime:Mms"
-      mcc="365"
-      mnc="840"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Anguilla:Lime:Mms'
+      mcc='365'
+      mnc='840'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Anguilla:Lime:Modem"
-      mcc="365"
-      mnc="840"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Anguilla:Lime:Modem'
+      mcc='365'
+      mnc='840'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="366"
       mnc="11"
       apn="internet"
@@ -17554,8 +16460,7 @@
       password=""
       type="default,supl,dun"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="366"
       mnc="11"
       apn="multimedia"
@@ -17566,45 +16471,41 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Dominica:Lime:Internet"
-      mcc="366"
-      mnc="110"
+  <apn carrier='Dominica:Lime:Internet'
+      mcc='366'
+      mnc='110'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='default'
+  />
+  <apn carrier='Dominica:Lime:Mms'
+      mcc='366'
+      mnc='110'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
+  />
+  <apn carrier='Dominica:Lime:Modem'
+      mcc='366'
+      mnc='110'
       apn="internet"
       authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="default"
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Dominica:Lime:Mms"
-      mcc="366"
-      mnc="110"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
-  />
-  <apn
-      carrier="Dominica:Lime:Modem"
-      mcc="366"
-      mnc="110"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
-  />
-  <apn
-      carrier="Internet"
+
+  <apn carrier="Internet"
       mcc="368"
       mnc="01"
       apn="internet"
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Cubacel MMS"
+  <apn carrier="Cubacel MMS"
       mcc="368"
       mnc="01"
       apn="mms"
@@ -17614,22 +16515,20 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet (LTE)"
+
+  <apn carrier="Orange Internet (LTE)"
       mcc="370"
       mnc="01"
       apn="orangeinternet"
       type="ia,default,supl"
   />
-  <apn
-      carrier="Orange net (3G)"
+  <apn carrier="Orange net (3G)"
       mcc="370"
       mnc="01"
       apn="orangenet.com.do"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="370"
       mnc="01"
       apn="orangeworld"
@@ -17641,16 +16540,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet Móvil Claro"
+  <apn carrier="Internet Móvil Claro"
       mcc="370"
       mnc="02"
       apn="internet.ideasclaro.com.do"
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS CLARO"
+  <apn carrier="MMS CLARO"
       mcc="370"
       mnc="02"
       apn="mms.ideasclaro.com.do"
@@ -17660,8 +16557,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Viva Edge (GSM)"
+  <apn carrier="Viva Edge (GSM)"
       mcc="370"
       mnc="04"
       apn="edge.viva.net.do"
@@ -17672,8 +16568,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Viva MMS"
+  <apn carrier="Viva MMS"
       mcc="370"
       mnc="04"
       apn="mms.viva.net.do"
@@ -17685,57 +16580,53 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet Móvil Claro"
+  <apn carrier="Internet Móvil Claro"
       mcc="370"
       mnc="020"
       apn="internet.ideasclaro.com.do"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="370"
       mnc="020"
       apn="internet.ideasclaro.com.do"
       mmsc="http://mms.ideasclaro.com.do/mms/wapenc"
       type="mms"
   />
-  <apn
-      carrier="Haiti:Digicel:Internet"
-      mcc="372"
-      mnc="02"
-      apn="wap.digicelha.com"
-      authtype="1"
-      type="default"
+
+  <apn carrier='Haiti:Digicel:Internet'
+      mcc='372'
+      mnc='02'
+      apn='wap.digicelha.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Haiti:Digicel:Mms"
-      mcc="372"
-      mnc="02"
-      apn="wap.digicelha.com"
-      authtype="1"
-      mmsc="http://mmc.digicelhaiti.com/servlets/mms"
-      mmsproxy="172.20.200.12"
-      mmsport="9201"
-      type="mms"
-      user="wapha"
-      password="wap01ha"
+  <apn carrier='Haiti:Digicel:Mms'
+      mcc='372'
+      mnc='02'
+      apn='wap.digicelha.com'
+      authtype='1'
+      mmsc='http://mmc.digicelhaiti.com/servlets/mms'
+      mmsproxy='172.20.200.12'
+      mmsport='9201'
+      type='mms'
+      user='wapha'
+      password='wap01ha'
   />
-  <apn
-      carrier="Haiti:Digicel:Modem"
-      mcc="372"
-      mnc="02"
-      apn="wap.digicelha.com"
-      port="8080"
-      authtype="1"
-      proxy="172.20.200.12"
-      mmsc="http://wapdigicel.com"
-      type="dun"
-      user="wapha"
-      password="wap01ha"
+  <apn carrier='Haiti:Digicel:Modem'
+      mcc='372'
+      mnc='02'
+      apn='wap.digicelha.com'
+      port='8080'
+      authtype='1'
+      proxy='172.20.200.12'
+      mmsc='http://wapdigicel.com'
+      type='dun'
+      user='wapha'
+      password='wap01ha'
   />
-  <apn
-      carrier="Bmobile internet"
+
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="12"
       apn="internet"
@@ -17744,8 +16635,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="12"
       apn="mms"
@@ -17757,8 +16647,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="INTERNET Trinidad"
+  <apn carrier="INTERNET Trinidad"
       mcc="374"
       mnc="13"
       apn="web.digiceltt.com"
@@ -17767,8 +16656,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Trinidad"
+  <apn carrier="MMS Trinidad"
       mcc="374"
       mnc="13"
       apn="wap.digiceltt.com"
@@ -17780,8 +16668,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="120"
       apn="internet"
@@ -17790,8 +16677,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="120"
       apn="mms"
@@ -17803,8 +16689,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="121"
       apn="internet"
@@ -17813,8 +16698,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="121"
       apn="mms"
@@ -17826,8 +16710,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="122"
       apn="internet"
@@ -17836,8 +16719,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="122"
       apn="mms"
@@ -17849,8 +16731,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="123"
       apn="internet"
@@ -17859,8 +16740,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="123"
       apn="mms"
@@ -17872,8 +16752,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="124"
       apn="internet"
@@ -17882,8 +16761,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="124"
       apn="mms"
@@ -17895,8 +16773,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="125"
       apn="internet"
@@ -17905,8 +16782,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="125"
       apn="mms"
@@ -17918,8 +16794,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="126"
       apn="internet"
@@ -17928,8 +16803,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="126"
       apn="mms"
@@ -17941,8 +16815,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="127"
       apn="internet"
@@ -17951,8 +16824,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="127"
       apn="mms"
@@ -17964,8 +16836,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="128"
       apn="internet"
@@ -17974,8 +16845,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="128"
       apn="mms"
@@ -17987,8 +16857,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Bmobile internet"
+  <apn carrier="Bmobile internet"
       mcc="374"
       mnc="129"
       apn="internet"
@@ -17997,8 +16866,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Bmobile mms"
+  <apn carrier="Bmobile mms"
       mcc="374"
       mnc="129"
       apn="mms"
@@ -18010,8 +16878,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="INTERNET Trinidad"
+  <apn carrier="INTERNET Trinidad"
       mcc="374"
       mnc="130"
       apn="web.digiceltt.com"
@@ -18020,8 +16887,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Trinidad"
+  <apn carrier="MMS Trinidad"
       mcc="374"
       mnc="130"
       apn="wap.digiceltt.com"
@@ -18033,8 +16899,8 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Lime Internet Postpaid"
+
+  <apn carrier="Lime Internet Postpaid"
       mcc="376"
       mnc="35"
       apn="internet"
@@ -18042,8 +16908,7 @@
       password=""
       type="default,supl"
   />
-  <apn
-      carrier="Lime Postpaid MMS"
+  <apn carrier="Lime Postpaid MMS"
       mcc="376"
       mnc="35"
       apn="multimedia"
@@ -18054,64 +16919,58 @@
       mmsc="http://mmsc"
       type="mms"
   />
-  <apn
-      carrier="Turks And Caicos:Lime:Internet"
-      mcc="376"
-      mnc="350"
-      apn="internet"
-      authtype="1"
-      type="default"
+  <apn carrier='Turks And Caicos:Lime:Internet'
+      mcc='376'
+      mnc='350'
+      apn='internet'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Turks And Caicos:Lime:Mms"
-      mcc="376"
-      mnc="350"
-      apn="multimedia"
-      authtype="1"
-      mmsc="http://mmsc"
-      mmsproxy="10.20.5.34"
-      mmsport="8799"
-      type="mms"
+  <apn carrier='Turks And Caicos:Lime:Mms'
+      mcc='376'
+      mnc='350'
+      apn='multimedia'
+      authtype='1'
+      mmsc='http://mmsc'
+      mmsproxy='10.20.5.34'
+      mmsport='8799'
+      type='mms'
   />
-  <apn
-      carrier="Turks And Caicos:Lime:Modem"
-      mcc="376"
-      mnc="350"
-      apn="internet"
-      authtype="1"
-      mmsc="http://www.time4lime.com/"
-      type="dun"
+  <apn carrier='Turks And Caicos:Lime:Modem'
+      mcc='376'
+      mnc='350'
+      apn='internet'
+      authtype='1'
+      mmsc='http://www.time4lime.com/'
+      type='dun'
   />
-  <apn
-      carrier="Azercell"
+
+  <apn carrier="Azercell"
       mcc="400"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Bakcell"
+  <apn carrier="Bakcell"
       mcc="400"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="FONEX"
+  <apn carrier="FONEX"
       mcc="400"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Nar Mobile"
+  <apn carrier="Nar Mobile"
       mcc="400"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline Internet"
+
+  <apn carrier="Beeline Internet"
       mcc="401"
       mnc="01"
       apn="internet.beeline.kz"
@@ -18119,8 +16978,7 @@
       password="beeline"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline MMS"
+  <apn carrier="Beeline MMS"
       mcc="401"
       mnc="01"
       apn="mms.beeline.kz"
@@ -18131,15 +16989,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Kcell Internet"
+  <apn carrier="Kcell Internet"
       mcc="401"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Kcell MMS"
+  <apn carrier="Kcell MMS"
       mcc="401"
       mnc="02"
       apn="mms"
@@ -18148,15 +17004,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Tele2 Internet"
+  <apn carrier="Tele2 Internet"
       mcc="401"
       mnc="77"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Tele2 MMS"
+  <apn carrier="Tele2 MMS"
       mcc="401"
       mnc="77"
       apn="mms"
@@ -18165,36 +17019,33 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="B-Mobile"
+
+  <apn carrier="B-Mobile"
       mcc="402"
       mnc="11"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="TashiCell"
+  <apn carrier="TashiCell"
       mcc="402"
       mnc="77"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="India"
+
+  <apn carrier="India"
       mcc="404"
       mnc="00"
       apn="india"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="01"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="01"
       apn="portalnmms"
@@ -18203,8 +17054,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="01"
       apn="ims"
@@ -18212,15 +17062,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="AIRTEL"
+  <apn carrier="AIRTEL"
       mcc="404"
       mnc="02"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="02"
       apn="airtelmms.com"
@@ -18229,15 +17077,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="AIRTEL"
+  <apn carrier="AIRTEL"
       mcc="404"
       mnc="03"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="03"
       apn="airtelmms.com"
@@ -18246,15 +17092,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="04"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="04"
       apn="mmsc"
@@ -18263,8 +17107,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="04"
       apn="ims"
@@ -18272,15 +17115,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="05"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="404"
       mnc="05"
       apn="portalnmms"
@@ -18289,8 +17130,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="05"
       apn="ims"
@@ -18298,15 +17138,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="07"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="07"
       apn="mmsc"
@@ -18315,8 +17153,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="07"
       apn="ims"
@@ -18324,8 +17161,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="09"
       apn="mms"
@@ -18334,15 +17170,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="09"
       apn="smartnet"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel IMS"
+  <apn carrier="Airtel IMS"
       mcc="404"
       mnc="10"
       apn="ims"
@@ -18351,15 +17185,13 @@
       roaming_protocol="IPV4V6"
       profile_id="2"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="10"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="10"
       apn="airtelmms.com"
@@ -18369,15 +17201,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="11"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="11"
       apn="portalnmms"
@@ -18386,8 +17216,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="11"
       apn="ims"
@@ -18395,15 +17224,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="12"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="12"
       apn="mmsc"
@@ -18412,8 +17239,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="12"
       apn="ims"
@@ -18421,15 +17247,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="13"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="13"
       apn="portalnmms"
@@ -18438,8 +17262,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="13"
       apn="ims"
@@ -18447,8 +17270,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA Punjab MMS"
+  <apn carrier="IDEA Punjab MMS"
       mcc="404"
       mnc="14"
       apn="mmsc"
@@ -18457,22 +17279,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA Punjab"
+  <apn carrier="IDEA Punjab"
       mcc="404"
       mnc="14"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone Connect"
+  <apn carrier="Vodafone Connect"
       mcc="404"
       mnc="15"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="15"
       apn="portalnmms"
@@ -18481,8 +17300,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="15"
       apn="ims"
@@ -18490,15 +17308,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="16"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="16"
       apn="airtelmms.com"
@@ -18507,8 +17323,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="17"
       apn="aircelmms"
@@ -18517,15 +17332,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="17"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="18"
       apn="mms"
@@ -18534,22 +17347,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="18"
       apn="smartnet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="19"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="19"
       apn="mmsc"
@@ -18558,8 +17368,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="19"
       apn="ims"
@@ -18567,15 +17376,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="20"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="20"
       apn="portalnmms"
@@ -18584,8 +17391,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="20"
       apn="ims"
@@ -18593,8 +17399,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Loop Mobile MMS"
+  <apn carrier="Loop Mobile MMS"
       mcc="404"
       mnc="21"
       apn="mizone"
@@ -18604,22 +17409,19 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="Loop Mobile"
+  <apn carrier="Loop Mobile"
       mcc="404"
       mnc="21"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="22"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="22"
       apn="mmsc"
@@ -18628,8 +17430,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="22"
       apn="ims"
@@ -18637,15 +17438,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="24"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="24"
       apn="mmsc"
@@ -18654,8 +17453,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="24"
       apn="ims"
@@ -18663,8 +17461,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="25"
       apn="aircelmms"
@@ -18673,22 +17470,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="25"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="27"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="27"
       apn="portalnmms"
@@ -18697,8 +17491,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="27"
       apn="ims"
@@ -18706,8 +17499,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="28"
       apn="aircelmms"
@@ -18716,15 +17508,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="28"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="29"
       apn="aircelmms"
@@ -18733,22 +17523,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="29"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="30"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="30"
       apn="portalnmms"
@@ -18757,8 +17544,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="30"
       apn="ims"
@@ -18766,15 +17552,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="AIRTEL"
+  <apn carrier="AIRTEL"
       mcc="404"
       mnc="31"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="31"
       apn="airtelmms.com"
@@ -18783,8 +17567,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="33"
       apn="aircelmms"
@@ -18793,15 +17576,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="33"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="34"
       apn="bsnlmms"
@@ -18810,15 +17591,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="34"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="34"
       apn="ims"
@@ -18826,8 +17605,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="35"
       apn="aircelmms"
@@ -18836,15 +17614,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="35"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="36"
       apn="mms"
@@ -18853,15 +17629,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="36"
       apn="SMARTNET"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel NE MMS"
+  <apn carrier="Aircel NE MMS"
       mcc="404"
       mnc="37"
       apn="aircelmms"
@@ -18870,15 +17644,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="37"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="CellOne_Kolkata MMS"
+  <apn carrier="CellOne_Kolkata MMS"
       mcc="404"
       mnc="38"
       apn="bsnlmms"
@@ -18887,15 +17659,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_Kolkata"
+  <apn carrier="CellOne_Kolkata"
       mcc="404"
       mnc="38"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="38"
       apn="ims"
@@ -18903,15 +17673,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="AIRTEL"
+  <apn carrier="AIRTEL"
       mcc="404"
       mnc="40"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="40"
       apn="airtelmms.com"
@@ -18920,15 +17688,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Aircel TN"
+  <apn carrier="Aircel TN"
       mcc="404"
       mnc="41"
       apn="aircelgprs.po"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel TN MMS"
+  <apn carrier="Aircel TN MMS"
       mcc="404"
       mnc="41"
       apn="aircelmms.po"
@@ -18937,15 +17703,13 @@
       mmsport="8081"
       type="mms"
   />
-  <apn
-      carrier="Aircel TN"
+  <apn carrier="Aircel TN"
       mcc="404"
       mnc="42"
       apn="aircelgprs.po"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel TN MMS"
+  <apn carrier="Aircel TN MMS"
       mcc="404"
       mnc="42"
       apn="aircelmms.po"
@@ -18954,15 +17718,13 @@
       mmsport="8081"
       type="mms"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="43"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="43"
       apn="portalnmms"
@@ -18971,8 +17733,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="43"
       apn="ims"
@@ -18980,15 +17741,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA Karnataka"
+  <apn carrier="IDEA Karnataka"
       mcc="404"
       mnc="44"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA Karnataka MMS"
+  <apn carrier="IDEA Karnataka MMS"
       mcc="404"
       mnc="44"
       apn="mmsc"
@@ -18997,8 +17756,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Airtel IMS"
+  <apn carrier="Airtel IMS"
       mcc="404"
       mnc="45"
       apn="ims"
@@ -19007,15 +17765,13 @@
       roaming_protocol="IPV4V6"
       profile_id="2"
   />
-  <apn
-      carrier="AIRTEL"
+  <apn carrier="AIRTEL"
       mcc="404"
       mnc="45"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="45"
       apn="airtelmms.com"
@@ -19024,15 +17780,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="46"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="46"
       apn="portalnmms"
@@ -19041,8 +17795,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="46"
       apn="ims"
@@ -19050,8 +17803,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Airtel IMS"
+  <apn carrier="Airtel IMS"
       mcc="404"
       mnc="49"
       apn="ims"
@@ -19060,15 +17812,13 @@
       roaming_protocol="IPV4V6"
       profile_id="2"
   />
-  <apn
-      carrier="AIRTEL"
+  <apn carrier="AIRTEL"
       mcc="404"
       mnc="49"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="49"
       apn="airtelmms.com"
@@ -19078,8 +17828,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="50"
       apn="mms"
@@ -19088,15 +17837,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="50"
       apn="SMARTNET"
       type="default,supl"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="51"
       apn="bsnlmms"
@@ -19105,15 +17852,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="51"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="51"
       apn="ims"
@@ -19121,8 +17866,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="52"
       apn="mms"
@@ -19131,15 +17875,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="52"
       apn="SMARTNET"
       type="default,supl"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="53"
       apn="bsnlmms"
@@ -19148,15 +17890,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="53"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="53"
       apn="ims"
@@ -19164,8 +17904,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="54"
       apn="bsnlmms"
@@ -19174,15 +17913,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="54"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="54"
       apn="ims"
@@ -19190,8 +17927,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="55"
       apn="bsnlmms"
@@ -19200,15 +17936,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="55"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="55"
       apn="ims"
@@ -19216,15 +17950,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="56"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="56"
       apn="mmsc"
@@ -19233,8 +17965,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="56"
       apn="ims"
@@ -19242,8 +17973,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_West MMS"
+  <apn carrier="Cellone_West MMS"
       mcc="404"
       mnc="57"
       apn="bsnlmms"
@@ -19252,15 +17982,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_West"
+  <apn carrier="Cellone_West"
       mcc="404"
       mnc="57"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="57"
       apn="ims"
@@ -19268,8 +17996,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_West MMS"
+  <apn carrier="Cellone_West MMS"
       mcc="404"
       mnc="58"
       apn="bsnlmms"
@@ -19278,15 +18005,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_West"
+  <apn carrier="Cellone_West"
       mcc="404"
       mnc="58"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="58"
       apn="ims"
@@ -19294,8 +18019,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="59"
       apn="bsnlmms"
@@ -19304,15 +18028,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="59"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="59"
       apn="ims"
@@ -19320,15 +18042,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="60"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="60"
       apn="portalnmms"
@@ -19337,8 +18057,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="60"
       apn="ims"
@@ -19346,8 +18065,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_North MMS"
+  <apn carrier="Cellone_North MMS"
       mcc="404"
       mnc="62"
       apn="bsnlmms"
@@ -19356,15 +18074,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_North"
+  <apn carrier="Cellone_North"
       mcc="404"
       mnc="62"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="62"
       apn="ims"
@@ -19372,8 +18088,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_South MMS"
+   <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="64"
       apn="bsnlmms"
@@ -19383,15 +18098,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_South"
+  <apn carrier="CellOne_South"
       mcc="404"
       mnc="64"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="64"
       apn="ims"
@@ -19399,8 +18112,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Cellone_West MMS"
+  <apn carrier="Cellone_West MMS"
       mcc="404"
       mnc="66"
       apn="bsnlmms"
@@ -19409,15 +18121,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cellone_West"
+  <apn carrier="Cellone_West"
       mcc="404"
       mnc="66"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="66"
       apn="ims"
@@ -19425,8 +18135,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="67"
       apn="mms"
@@ -19435,15 +18144,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="67"
       apn="smartnet"
       type="default,supl"
   />
-  <apn
-      carrier="Dolphin_Delhi MMS"
+  <apn carrier="Dolphin_Delhi MMS"
       mcc="404"
       mnc="68"
       apn="gprsmtnldel"
@@ -19455,8 +18162,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Dolphin_Delhi"
+  <apn carrier="Dolphin_Delhi"
       mcc="404"
       mnc="68"
       apn="gprsmtnldel"
@@ -19464,8 +18170,7 @@
       password="mtnl123"
       type="default,supl"
   />
-  <apn
-      carrier="Dolphin_Delhi_3G MMS"
+  <apn carrier="Dolphin_Delhi_3G MMS"
       mcc="404"
       mnc="68"
       apn="mtnl3g"
@@ -19476,8 +18181,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="Dolphin_Delhi_3G"
+  <apn carrier="Dolphin_Delhi_3G"
       mcc="404"
       mnc="68"
       apn="mtnl3g"
@@ -19485,8 +18189,7 @@
       password="mtnl123"
       type="default,supl"
   />
-  <apn
-      carrier="Dolphin_Mumbai MMS"
+  <apn carrier="Dolphin_Mumbai MMS"
       mcc="404"
       mnc="69"
       apn="gprsmtnlmum"
@@ -19497,8 +18200,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Dolphin_Mumbai"
+  <apn carrier="Dolphin_Mumbai"
       mcc="404"
       mnc="69"
       apn="gprsmtnlmum"
@@ -19506,8 +18208,7 @@
       password="mtnl123"
       type="default,supl"
   />
-  <apn
-      carrier="Dolphin_Mumbai_3G MMS"
+  <apn carrier="Dolphin_Mumbai_3G MMS"
       mcc="404"
       mnc="69"
       apn="mtnl3g"
@@ -19518,8 +18219,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="Dolphin_Mumbai_3G"
+  <apn carrier="Dolphin_Mumbai_3G"
       mcc="404"
       mnc="69"
       apn="mtnl3g"
@@ -19527,15 +18227,13 @@
       password="mtnl123"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="70"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="70"
       apn="airtelmms.com"
@@ -19544,8 +18242,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="CellOne_South MMS"
+  <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="71"
       apn="bsnlmms"
@@ -19555,15 +18252,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_South"
+  <apn carrier="CellOne_South"
       mcc="404"
       mnc="71"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="71"
       apn="ims"
@@ -19571,8 +18266,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_South MMS"
+  <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="72"
       apn="bsnlmms"
@@ -19582,15 +18276,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="bsnlnet"
+  <apn carrier="bsnlnet"
       mcc="404"
       mnc="72"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="72"
       apn="ims"
@@ -19598,8 +18290,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_South MMS"
+  <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="73"
       apn="bsnlmms"
@@ -19609,15 +18300,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_South"
+  <apn carrier="CellOne_South"
       mcc="404"
       mnc="73"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="73"
       apn="ims"
@@ -19625,8 +18314,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_Kolkata MMS"
+  <apn carrier="CellOne_Kolkata MMS"
       mcc="404"
       mnc="74"
       apn="bsnlmms"
@@ -19635,15 +18323,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_Kolkata"
+  <apn carrier="CellOne_Kolkata"
       mcc="404"
       mnc="74"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="74"
       apn="ims"
@@ -19651,8 +18337,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_Kolkata MMS"
+  <apn carrier="CellOne_Kolkata MMS"
       mcc="404"
       mnc="75"
       apn="bsnlmms"
@@ -19661,15 +18346,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_Kolkata"
+  <apn carrier="CellOne_Kolkata"
       mcc="404"
       mnc="75"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="75"
       apn="ims"
@@ -19677,8 +18360,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_Kolkata MMS"
+  <apn carrier="CellOne_Kolkata MMS"
       mcc="404"
       mnc="76"
       apn="bsnlmms"
@@ -19687,15 +18369,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_Kolkata"
+  <apn carrier="CellOne_Kolkata"
       mcc="404"
       mnc="76"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="76"
       apn="ims"
@@ -19703,8 +18383,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_Kolkata MMS"
+  <apn carrier="CellOne_Kolkata MMS"
       mcc="404"
       mnc="77"
       apn="bsnlmms"
@@ -19713,15 +18392,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_Kolkata"
+  <apn carrier="CellOne_Kolkata"
       mcc="404"
       mnc="77"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="77"
       apn="ims"
@@ -19729,15 +18406,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="78"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="78"
       apn="mmsc"
@@ -19746,8 +18421,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="78"
       apn="ims"
@@ -19755,8 +18429,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_South MMS"
+  <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="79"
       apn="bsnlmms"
@@ -19766,15 +18439,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_South"
+  <apn carrier="CellOne_South"
       mcc="404"
       mnc="79"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="79"
       apn="ims"
@@ -19782,8 +18453,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_South MMS"
+  <apn carrier="CellOne_South MMS"
       mcc="404"
       mnc="80"
       apn="bsnlmms"
@@ -19793,15 +18463,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_South"
+  <apn carrier="CellOne_South"
       mcc="404"
       mnc="80"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="80"
       apn="ims"
@@ -19809,8 +18477,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CellOne_Kolkata MMS"
+  <apn carrier="CellOne_Kolkata MMS"
       mcc="404"
       mnc="81"
       apn="bsnlmms"
@@ -19819,15 +18486,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CellOne_Kolkata"
+  <apn carrier="CellOne_Kolkata"
       mcc="404"
       mnc="81"
       apn="bsnlnet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="81"
       apn="ims"
@@ -19835,15 +18500,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="82"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="82"
       apn="mmsc"
@@ -19852,8 +18515,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="82"
       apn="ims"
@@ -19861,8 +18523,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="83"
       apn="mms"
@@ -19871,22 +18532,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="83"
       apn="SMARTNET"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="84"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="84"
       apn="portalnmms"
@@ -19895,8 +18553,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="84"
       apn="ims"
@@ -19904,8 +18561,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Reliance RTel MMS"
+  <apn carrier="Reliance RTel MMS"
       mcc="404"
       mnc="85"
       apn="mms"
@@ -19914,22 +18570,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RTel"
+  <apn carrier="Reliance RTel"
       mcc="404"
       mnc="85"
       apn="SMARTNET"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="86"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="86"
       apn="portalnmms"
@@ -19938,8 +18591,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="86"
       apn="ims"
@@ -19947,15 +18599,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="87"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="87"
       apn="mmsc"
@@ -19964,8 +18614,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="87"
       apn="ims"
@@ -19973,15 +18622,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="404"
       mnc="88"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="404"
       mnc="88"
       apn="portalnmms"
@@ -19990,8 +18637,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="404"
       mnc="88"
       apn="ims"
@@ -19999,15 +18645,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="404"
       mnc="89"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="404"
       mnc="89"
       apn="mmsc"
@@ -20016,8 +18660,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="404"
       mnc="89"
       apn="ims"
@@ -20025,15 +18668,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="90"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="90"
       apn="airtelmms.com"
@@ -20042,8 +18683,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Aircel-MMS"
+  <apn carrier="Aircel-MMS"
       mcc="404"
       mnc="91"
       apn="aircelmms"
@@ -20052,15 +18692,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL NE"
+  <apn carrier="AIRCEL NE"
       mcc="404"
       mnc="91"
       apn="aircelwebpost"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel IMS"
+  <apn carrier="Airtel IMS"
       mcc="404"
       mnc="92"
       apn="ims"
@@ -20069,15 +18707,13 @@
       roaming_protocol="IPV4V6"
       profile_id="2"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="92"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="92"
       apn="airtelmms.com"
@@ -20086,15 +18722,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="93"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="93"
       apn="airtelmms.com"
@@ -20103,15 +18737,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="94"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="94"
       apn="airtelmms.com"
@@ -20120,15 +18752,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="95"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="95"
       apn="airtelmms.com"
@@ -20137,15 +18767,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="96"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="96"
       apn="airtelmms.com"
@@ -20154,15 +18782,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="97"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="97"
       apn="airtelmms.com"
@@ -20171,15 +18797,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="404"
       mnc="98"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="404"
       mnc="98"
       apn="airtelmms.com"
@@ -20188,8 +18812,8 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="01"
       apn="rcommms"
@@ -20198,15 +18822,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="01"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="03"
       apn="rcommms"
@@ -20215,15 +18837,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="03"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="04"
       apn="rcommms"
@@ -20232,15 +18852,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="04"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="05"
       apn="rcommms"
@@ -20249,15 +18867,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="05"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="06"
       apn="rcommms"
@@ -20266,15 +18882,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="06"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="07"
       apn="rcommms"
@@ -20283,15 +18897,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="07"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="08"
       apn="rcommms"
@@ -20300,15 +18912,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="08"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="09"
       apn="rcommms"
@@ -20317,15 +18927,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="09"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="10"
       apn="rcommms"
@@ -20334,15 +18942,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="10"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="11"
       apn="rcommms"
@@ -20351,15 +18957,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="11"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="12"
       apn="rcommms"
@@ -20368,15 +18972,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="12"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="13"
       apn="rcommms"
@@ -20385,15 +18987,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="13"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="14"
       apn="rcommms"
@@ -20402,15 +19002,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="14"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="15"
       apn="rcommms"
@@ -20419,15 +19017,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="15"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="17"
       apn="rcommms"
@@ -20436,15 +19032,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="17"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="18"
       apn="rcommms"
@@ -20453,15 +19047,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="18"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="19"
       apn="rcommms"
@@ -20470,15 +19062,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="19"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="20"
       apn="rcommms"
@@ -20487,15 +19077,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="20"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="21"
       apn="rcommms"
@@ -20504,15 +19092,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="21"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="22"
       apn="rcommms"
@@ -20521,15 +19107,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="22"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="Reliance RCOM MMS"
+  <apn carrier="Reliance RCOM MMS"
       mcc="405"
       mnc="23"
       apn="rcommms"
@@ -20538,22 +19122,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Reliance RCOM"
+  <apn carrier="Reliance RCOM"
       mcc="405"
       mnc="23"
       apn="rcomnet"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="025"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="025"
       apn="TATA.DOCOMO.MMS"
@@ -20562,15 +19143,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="026"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="026"
       apn="TATA.DOCOMO.MMS"
@@ -20579,15 +19158,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="027"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="027"
       apn="TATA.DOCOMO.MMS"
@@ -20596,15 +19173,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="028"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="028"
       apn="TATA.DOCOMO.MMS"
@@ -20613,15 +19188,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="029"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="029"
       apn="TATA.DOCOMO.MMS"
@@ -20630,15 +19203,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="030"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="030"
       apn="TATA.DOCOMO.MMS"
@@ -20647,15 +19218,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="031"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="031"
       apn="TATA.DOCOMO.MMS"
@@ -20664,15 +19233,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="032"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="032"
       apn="TATA.DOCOMO.MMS"
@@ -20681,15 +19248,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="033"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="033"
       apn="TATA.DOCOMO.MMS"
@@ -20698,15 +19263,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="034"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="034"
       apn="TATA.DOCOMO.MMS"
@@ -20715,15 +19278,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="035"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="035"
       apn="TATA.DOCOMO.MMS"
@@ -20732,15 +19293,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="036"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="036"
       apn="TATA.DOCOMO.MMS"
@@ -20749,15 +19308,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="037"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="037"
       apn="TATA.DOCOMO.MMS"
@@ -20766,15 +19323,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="038"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="038"
       apn="TATA.DOCOMO.MMS"
@@ -20783,15 +19338,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="039"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="039"
       apn="TATA.DOCOMO.MMS"
@@ -20800,15 +19353,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="040"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="040"
       apn="TATA.DOCOMO.MMS"
@@ -20817,15 +19368,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="041"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="041"
       apn="TATA.DOCOMO.MMS"
@@ -20834,15 +19383,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="042"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="042"
       apn="TATA.DOCOMO.MMS"
@@ -20851,15 +19398,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="043"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="043"
       apn="TATA.DOCOMO.MMS"
@@ -20868,15 +19413,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="044"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="044"
       apn="TATA.DOCOMO.MMS"
@@ -20885,15 +19428,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="045"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="045"
       apn="TATA.DOCOMO.MMS"
@@ -20902,15 +19443,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="046"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="046"
       apn="TATA.DOCOMO.MMS"
@@ -20919,15 +19458,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="TATA DOCOMO INTERNET"
+  <apn carrier="TATA DOCOMO INTERNET"
       mcc="405"
       mnc="047"
       apn="TATA.DOCOMO.INTERNET"
       type="default,supl"
   />
-  <apn
-      carrier="TATA DOCOMO MMS"
+  <apn carrier="TATA DOCOMO MMS"
       mcc="405"
       mnc="047"
       apn="TATA.DOCOMO.MMS"
@@ -20936,15 +19473,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="405"
       mnc="51"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="405"
       mnc="51"
       apn="airtelmms.com"
@@ -20953,15 +19488,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="405"
       mnc="52"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="405"
       mnc="52"
       apn="airtelmms.com"
@@ -20970,15 +19503,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="405"
       mnc="53"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="405"
       mnc="53"
       apn="airtelmms.com"
@@ -20987,15 +19518,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="405"
       mnc="54"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="405"
       mnc="54"
       apn="airtelmms.com"
@@ -21004,15 +19533,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="405"
       mnc="55"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="405"
       mnc="55"
       apn="airtelmms.com"
@@ -21021,15 +19548,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="405"
       mnc="56"
       apn="airtelgprs.com"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       mcc="405"
       mnc="56"
       apn="airtelmms.com"
@@ -21038,15 +19563,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="66"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="66"
       apn="portalnmms"
@@ -21055,8 +19578,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="66"
       apn="ims"
@@ -21064,15 +19586,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="67"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="67"
       apn="portalnmms"
@@ -21081,8 +19601,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="67"
       apn="ims"
@@ -21090,15 +19609,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="70"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="70"
       apn="mmsc"
@@ -21107,8 +19624,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       mcc="405"
       mnc="750"
       apn="vodafonelivejk"
@@ -21117,15 +19633,13 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="Vodafone connect"
+  <apn carrier="Vodafone connect"
       mcc="405"
       mnc="750"
       apn="jkgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone live"
+  <apn carrier="Vodafone live"
       mcc="405"
       mnc="750"
       apn="vodafonelivejk"
@@ -21133,8 +19647,7 @@
       port="9401"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="750"
       apn="ims"
@@ -21142,15 +19655,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="751"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="751"
       apn="portalnmms"
@@ -21159,8 +19670,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="751"
       apn="ims"
@@ -21168,15 +19678,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="752"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="752"
       apn="portalnmms"
@@ -21185,8 +19693,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="752"
       apn="ims"
@@ -21194,15 +19701,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="753"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="753"
       apn="portalnmms"
@@ -21211,8 +19716,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="753"
       apn="ims"
@@ -21220,15 +19724,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="754"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="754"
       apn="portalnmms"
@@ -21237,8 +19739,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="754"
       apn="ims"
@@ -21246,15 +19747,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="755"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="755"
       apn="portalnmms"
@@ -21263,8 +19762,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="755"
       apn="ims"
@@ -21272,15 +19770,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vodafonemobileconnect"
+  <apn carrier="Vodafonemobileconnect"
       mcc="405"
       mnc="756"
       apn="www"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone_MMS"
+  <apn carrier="Vodafone_MMS"
       mcc="405"
       mnc="756"
       apn="portalnmms"
@@ -21289,8 +19785,7 @@
       mmsport="9401"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="405"
       mnc="756"
       apn="ims"
@@ -21298,15 +19793,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="799"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="799"
       apn="mmsc"
@@ -21315,8 +19808,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="799"
       apn="ims"
@@ -21324,15 +19816,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="AIRCEL ROI"
+  <apn carrier="AIRCEL ROI"
       mcc="405"
       mnc="800"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="AIRCEL ROI MMS"
+  <apn carrier="AIRCEL ROI MMS"
       mcc="405"
       mnc="800"
       apn="aircelmms"
@@ -21341,15 +19831,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIRCEL South"
+  <apn carrier="AIRCEL South"
       mcc="405"
       mnc="801"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="AIRCEL South MMS"
+  <apn carrier="AIRCEL South MMS"
       mcc="405"
       mnc="801"
       apn="aircelmms"
@@ -21358,15 +19846,13 @@
       mmsport="8081"
       type="mms"
   />
-  <apn
-      carrier="Aircel Central"
+  <apn carrier="Aircel Central"
       mcc="405"
       mnc="802"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel Central MMS"
+  <apn carrier="Aircel Central MMS"
       mcc="405"
       mnc="802"
       apn="aircelmms"
@@ -21375,15 +19861,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel Central"
+  <apn carrier="Aircel Central"
       mcc="405"
       mnc="803"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel Central MMS"
+  <apn carrier="Aircel Central MMS"
       mcc="405"
       mnc="803"
       apn="aircelmms"
@@ -21392,15 +19876,13 @@
       mmsport="8081"
       type="mms"
   />
-  <apn
-      carrier="Aircel ROI"
+  <apn carrier="Aircel ROI"
       mcc="405"
       mnc="804"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel ROI MMS"
+  <apn carrier="Aircel ROI MMS"
       mcc="405"
       mnc="804"
       apn="aircelmms"
@@ -21409,15 +19891,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel ROI"
+  <apn carrier="Aircel ROI"
       mcc="405"
       mnc="805"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel ROI MMS"
+  <apn carrier="Aircel ROI MMS"
       mcc="405"
       mnc="805"
       apn="aircelmms"
@@ -21426,15 +19906,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel Central"
+  <apn carrier="Aircel Central"
       mcc="405"
       mnc="806"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel Central MMS"
+  <apn carrier="Aircel Central MMS"
       mcc="405"
       mnc="806"
       apn="aircelmms"
@@ -21443,15 +19921,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel Central"
+  <apn carrier="Aircel Central"
       mcc="405"
       mnc="807"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel Central MMS"
+  <apn carrier="Aircel Central MMS"
       mcc="405"
       mnc="807"
       apn="aircelmms"
@@ -21460,15 +19936,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel Central"
+  <apn carrier="Aircel Central"
       mcc="405"
       mnc="808"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel Central MMS"
+  <apn carrier="Aircel Central MMS"
       mcc="405"
       mnc="808"
       apn="aircelmms"
@@ -21477,15 +19951,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel South"
+  <apn carrier="Aircel South"
       mcc="405"
       mnc="809"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel South MMS"
+  <apn carrier="Aircel South MMS"
       mcc="405"
       mnc="809"
       apn="aircelmms"
@@ -21494,15 +19966,13 @@
       mmsport="8081"
       type="mms"
   />
-  <apn
-      carrier="Aircel ROI"
+  <apn carrier="Aircel ROI"
       mcc="405"
       mnc="810"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel ROI MMS"
+  <apn carrier="Aircel ROI MMS"
       mcc="405"
       mnc="810"
       apn="aircelmms"
@@ -21511,15 +19981,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel ROI"
+  <apn carrier="Aircel ROI"
       mcc="405"
       mnc="811"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel ROI MMS"
+  <apn carrier="Aircel ROI MMS"
       mcc="405"
       mnc="811"
       apn="aircelmms"
@@ -21528,15 +19996,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Aircel Central"
+  <apn carrier="Aircel Central"
       mcc="405"
       mnc="812"
       apn="aircelgprs"
       type="default,supl"
   />
-  <apn
-      carrier="Aircel Central MMS"
+  <apn carrier="Aircel Central MMS"
       mcc="405"
       mnc="812"
       apn="aircelmms"
@@ -21545,15 +20011,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="813"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="813"
       apn="uninor"
@@ -21562,15 +20026,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="814"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="814"
       apn="uninor"
@@ -21579,15 +20041,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="815"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="815"
       apn="uninor"
@@ -21596,15 +20056,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="816"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="816"
       apn="uninor"
@@ -21613,15 +20071,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="817"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="817"
       apn="uninor"
@@ -21630,15 +20086,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="818"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="818"
       apn="uninor"
@@ -21647,15 +20101,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="819"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="819"
       apn="uninor"
@@ -21664,15 +20116,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="820"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="820"
       apn="uninor"
@@ -21681,15 +20131,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="821"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="821"
       apn="uninor"
@@ -21698,15 +20146,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="822"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="822"
       apn="uninor"
@@ -21715,8 +20161,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="823"
       apn="vgprs.com"
@@ -21725,15 +20170,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="823"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="824"
       apn="vgprs.com"
@@ -21742,15 +20185,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="824"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="825"
       apn="vgprs.com"
@@ -21759,15 +20200,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="825"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="826"
       apn="vgprs.com"
@@ -21776,15 +20215,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="826"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="827"
       apn="vgprs.com"
@@ -21793,15 +20230,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="827"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="828"
       apn="vgprs.com"
@@ -21810,15 +20245,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="828"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="829"
       apn="vgprs.com"
@@ -21827,15 +20260,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="829"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="830"
       apn="vgprs.com"
@@ -21844,15 +20275,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="830"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="831"
       apn="vgprs.com"
@@ -21861,15 +20290,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="831"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="832"
       apn="vgprs.com"
@@ -21878,15 +20305,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="832"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="833"
       apn="vgprs.com"
@@ -21895,15 +20320,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="833"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="834"
       apn="vgprs.com"
@@ -21912,15 +20335,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="834"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="835"
       apn="vgprs.com"
@@ -21929,15 +20350,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="835"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="836"
       apn="vgprs.com"
@@ -21946,15 +20365,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="836"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="837"
       apn="vgprs.com"
@@ -21963,15 +20380,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="837"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="838"
       apn="vgprs.com"
@@ -21980,15 +20395,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="838"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="839"
       apn="vgprs.com"
@@ -21997,15 +20410,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="839"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="840"
@@ -22013,8 +20424,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="840"
@@ -22023,8 +20433,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn="sos"
       mcc="405"
       mnc="840"
@@ -22033,8 +20442,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="840"
@@ -22043,8 +20451,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="841"
       apn="vgprs.com"
@@ -22053,15 +20460,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="841"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="842"
       apn="vgprs.com"
@@ -22070,15 +20475,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="842"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="843"
       apn="vgprs.com"
@@ -22087,22 +20490,19 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="843"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="844"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="844"
       apn="uninor"
@@ -22111,15 +20511,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="845"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="845"
       apn="mmsc"
@@ -22128,8 +20526,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="845"
       apn="ims"
@@ -22137,15 +20534,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="846"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="846"
       apn="mmsc"
@@ -22154,8 +20549,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="846"
       apn="ims"
@@ -22163,15 +20557,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="847"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="847"
       apn="mmsc"
@@ -22180,8 +20572,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="847"
       apn="ims"
@@ -22189,15 +20580,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="848"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="848"
       apn="mmsc"
@@ -22206,8 +20595,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="848"
       apn="ims"
@@ -22215,15 +20603,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="849"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="849"
       apn="mmsc"
@@ -22232,8 +20618,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="849"
       apn="ims"
@@ -22241,15 +20626,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="850"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="850"
       apn="mmsc"
@@ -22258,8 +20641,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="850"
       apn="ims"
@@ -22267,15 +20649,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="851"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="851"
       apn="mmsc"
@@ -22284,8 +20664,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="851"
       apn="ims"
@@ -22293,15 +20672,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="852"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="852"
       apn="mmsc"
@@ -22310,8 +20687,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="852"
       apn="ims"
@@ -22319,15 +20695,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="853"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="853"
       apn="mmsc"
@@ -22336,8 +20710,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA IMS"
+  <apn carrier="IDEA IMS"
       mcc="405"
       mnc="853"
       apn="ims"
@@ -22345,8 +20718,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="854"
@@ -22354,8 +20726,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="854"
@@ -22364,8 +20735,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="854"
@@ -22373,8 +20743,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="855"
@@ -22382,8 +20751,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="855"
@@ -22392,8 +20760,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="855"
@@ -22402,8 +20769,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="856"
@@ -22411,8 +20777,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="856"
@@ -22421,8 +20786,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="856"
@@ -22431,8 +20795,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="857"
@@ -22440,8 +20803,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="857"
@@ -22450,8 +20812,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="857"
@@ -22460,8 +20821,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="858"
@@ -22469,8 +20829,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="858"
@@ -22479,8 +20838,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="858"
@@ -22489,8 +20847,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="859"
@@ -22498,8 +20855,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="859"
@@ -22508,8 +20864,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="859"
@@ -22518,8 +20873,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="860"
@@ -22527,8 +20881,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="860"
@@ -22537,8 +20890,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="860"
@@ -22547,8 +20899,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="861"
@@ -22556,8 +20907,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="861"
@@ -22566,8 +20916,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="861"
@@ -22576,8 +20925,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="862"
@@ -22585,8 +20933,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="862"
@@ -22595,8 +20942,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="862"
@@ -22605,8 +20951,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="863"
@@ -22614,8 +20959,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="863"
@@ -22624,8 +20968,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="863"
@@ -22634,8 +20977,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="864"
@@ -22643,8 +20985,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="864"
@@ -22653,8 +20994,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="864"
@@ -22663,8 +21003,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="865"
@@ -22672,8 +21011,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="865"
@@ -22682,8 +21020,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="865"
@@ -22692,8 +21029,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="866"
@@ -22701,8 +21037,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="866"
@@ -22711,8 +21046,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="866"
@@ -22721,8 +21055,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="867"
@@ -22730,8 +21063,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="867"
@@ -22740,8 +21072,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="867"
@@ -22750,8 +21081,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="868"
@@ -22759,8 +21089,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="868"
@@ -22769,8 +21098,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="868"
@@ -22779,8 +21107,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="869"
@@ -22788,8 +21115,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="869"
@@ -22798,8 +21124,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="869"
@@ -22808,8 +21133,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="870"
@@ -22817,8 +21141,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="870"
@@ -22827,8 +21150,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="870"
@@ -22837,8 +21159,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="871"
@@ -22846,8 +21167,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="871"
@@ -22856,8 +21176,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="871"
@@ -22866,8 +21185,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="872"
@@ -22875,8 +21193,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="872"
@@ -22885,8 +21202,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="872"
@@ -22895,8 +21211,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="873"
@@ -22904,8 +21219,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="873"
@@ -22914,8 +21228,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="873"
@@ -22924,8 +21237,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Jio 4G"
+  <apn carrier="Jio 4G"
       apn="jionet"
       mcc="405"
       mnc="874"
@@ -22933,8 +21245,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       apn="ims"
       mcc="405"
       mnc="874"
@@ -22943,8 +21254,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Emergency IMS"
+  <apn carrier="Emergency IMS"
       apn=""
       mcc="405"
       mnc="874"
@@ -22953,15 +21263,13 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="875"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="875"
       apn="uninor"
@@ -22970,15 +21278,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor GPRS"
+  <apn carrier="Uninor GPRS"
       mcc="405"
       mnc="876"
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="876"
       apn="uninor"
@@ -22987,16 +21293,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="877"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="877"
       proxy="10.58.10.58"
@@ -23004,8 +21308,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="877"
       apn="uninor"
@@ -23014,16 +21317,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="878"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="878"
       proxy="10.58.10.58"
@@ -23031,8 +21332,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="878"
       apn="uninor"
@@ -23041,16 +21341,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="879"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="879"
       proxy="10.58.10.58"
@@ -23058,8 +21356,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="879"
       apn="uninor"
@@ -23068,16 +21365,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="880"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="880"
       proxy="10.58.10.58"
@@ -23085,8 +21380,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="880"
       apn="uninor"
@@ -23095,57 +21389,49 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="STEL"
+  <apn carrier="STEL"
       mcc="405"
       mnc="881"
       apn="gprs.stel.in"
       type="default,supl"
   />
-  <apn
-      carrier="STEL"
+  <apn carrier="STEL"
       mcc="405"
       mnc="882"
       apn="gprs.stel.in"
       type="default,supl"
   />
-  <apn
-      carrier="STEL"
+  <apn carrier="STEL"
       mcc="405"
       mnc="883"
       apn="gprs.stel.in"
       type="default,supl"
   />
-  <apn
-      carrier="STEL"
+  <apn carrier="STEL"
       mcc="405"
       mnc="884"
       apn="gprs.stel.in"
       type="default,supl"
   />
-  <apn
-      carrier="STEL"
+  <apn carrier="STEL"
       mcc="405"
       mnc="885"
       apn="gprs.stel.in"
       type="default,supl"
   />
-  <apn
-      carrier="STEL"
+  <apn carrier="STEL"
       mcc="405"
       mnc="886"
       apn="gprs.stel.in"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="908"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="908"
       apn="mmsc"
@@ -23154,15 +21440,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="909"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="909"
       apn="mmsc"
@@ -23171,15 +21455,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="910"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="910"
       apn="mmsc"
@@ -23188,15 +21470,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="IDEA"
+  <apn carrier="IDEA"
       mcc="405"
       mnc="911"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IDEA MMS"
+  <apn carrier="IDEA MMS"
       mcc="405"
       mnc="911"
       apn="mmsc"
@@ -23205,107 +21485,92 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="912"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="913"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="914"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="915"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="916"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="917"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="918"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="919"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="920"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="921"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="922"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="923"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="924"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="925"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="925"
       proxy="10.58.10.58"
@@ -23313,8 +21578,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="925"
       apn="uninor"
@@ -23323,16 +21587,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="926"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="926"
       proxy="10.58.10.58"
@@ -23340,8 +21602,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="926"
       apn="uninor"
@@ -23350,16 +21611,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="927"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="927"
       proxy="10.58.10.58"
@@ -23367,8 +21626,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="927"
       apn="uninor"
@@ -23377,16 +21635,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="928"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="928"
       proxy="10.58.10.58"
@@ -23394,8 +21650,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="928"
       apn="uninor"
@@ -23404,16 +21659,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Uninor Internet"
+  <apn carrier="Uninor Internet"
       mcc="405"
       mnc="929"
       apn="uninor"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor Wap"
+  <apn carrier="Uninor Wap"
       mcc="405"
       mnc="929"
       proxy="10.58.10.58"
@@ -23421,8 +21674,7 @@
       apn="uninor"
       type="default,supl"
   />
-  <apn
-      carrier="Uninor MMS"
+  <apn carrier="Uninor MMS"
       mcc="405"
       mnc="929"
       apn="uninor"
@@ -23431,22 +21683,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="930"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Cheers"
+  <apn carrier="Cheers"
       mcc="405"
       mnc="931"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Videocon MMS"
+  <apn carrier="Videocon MMS"
       mcc="405"
       mnc="932"
       apn="vgprs.com"
@@ -23455,15 +21704,14 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Videocon"
+  <apn carrier="Videocon"
       mcc="405"
       mnc="932"
       apn="vinternet.com"
       type="default,supl"
   />
-  <apn
-      carrier="Mobilink WAP GPRS"
+
+  <apn carrier="Mobilink WAP GPRS"
       mcc="410"
       mnc="01"
       apn="connect.mobilinkworld.com"
@@ -23471,8 +21719,7 @@
       password="Mobilink"
       type="default,supl"
   />
-  <apn
-      carrier="Mobilink MMS"
+  <apn carrier="Mobilink MMS"
       mcc="410"
       mnc="01"
       apn="mms.mobilinkworld.com"
@@ -23483,15 +21730,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Ufone WAP"
+  <apn carrier="Ufone WAP"
       mcc="410"
       mnc="03"
       apn="Ufone.internet"
       type="default,supl"
   />
-  <apn
-      carrier="Ufone MMS"
+  <apn carrier="Ufone MMS"
       mcc="410"
       mnc="03"
       apn="Ufone.mms"
@@ -23500,15 +21745,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="ZONG WAP"
+  <apn carrier="ZONG WAP"
       mcc="410"
       mnc="04"
       apn="zonginternet"
       type="default,supl"
   />
-  <apn
-      carrier="ZONG MMS"
+  <apn carrier="ZONG MMS"
       mcc="410"
       mnc="04"
       apn="zongmms"
@@ -23517,15 +21760,13 @@
       mmsport="8000"
       type="mms"
   />
-  <apn
-      carrier="Telenor WAP"
+  <apn carrier="Telenor WAP"
       mcc="410"
       mnc="06"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Telenor MMS"
+  <apn carrier="Telenor MMS"
       mcc="410"
       mnc="06"
       apn="mms"
@@ -23536,15 +21777,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Warid WAP"
+  <apn carrier="Warid WAP"
       mcc="410"
       mnc="07"
       apn="Wap.warid"
       type="default,supl"
   />
-  <apn
-      carrier="Warid MMS"
+  <apn carrier="Warid MMS"
       mcc="410"
       mnc="07"
       apn="mms.warid"
@@ -23553,92 +21792,83 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Consumer Cellular"
-      mcc="410"
-      mnc="310"
-      apn="att.mvno"
-      type="default,mms,supl,hipri,fota"
-      protocol="IP"
-      roaming_protocol="IP"
-      mmsc="http://mms.fido.ca"
-      mmsproxy="mmsproxy.fido.ca"
-      mmsport="80"
-      mvno_type="gid"
-      mvno_match_data="2AC9"
+  <apn carrier='Consumer Cellular'
+      mcc='410'
+      mnc='310'
+      apn='att.mvno'
+      type='default,mms,supl,hipri,fota'
+      protocol='IP'
+      roaming_protocol='IP'
+      mmsc='http://mms.fido.ca'
+      mmsproxy='mmsproxy.fido.ca'
+      mmsport='80'
+      mvno_type='gid'
+      mvno_match_data='2AC9'
   />
-  <apn
-      carrier="AWCC"
+
+  <apn carrier="AWCC"
       mcc="412"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Roshan"
+  <apn carrier="Roshan"
       mcc="412"
       mnc="20"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN"
+  <apn carrier="MTN"
       mcc="412"
       mnc="40"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Etisalat"
+  <apn carrier="Etisalat"
       mcc="412"
       mnc="50"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Mobitel"
+
+  <apn carrier="Mobitel"
       mcc="413"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Dialog"
+  <apn carrier="Dialog"
       mcc="413"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Etisalat"
+  <apn carrier="Etisalat"
       mcc="413"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="413"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Hutch"
+  <apn carrier="Hutch"
       mcc="413"
       mnc="08"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MPT"
+
+  <apn carrier="MPT"
       mcc="414"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MPT Internet"
+  <apn carrier="MPT Internet"
       mcc="414"
       mnc="01"
       apn="mptnet"
@@ -23647,8 +21877,7 @@
       password="0"
       type="default,supl"
   />
-  <apn
-      carrier="Alfa Internet"
+  <apn carrier="Alfa Internet"
       mcc="415"
       mnc="01"
       user="mic1"
@@ -23656,8 +21885,7 @@
       apn="internet.mic1.com.lb"
       type="default,supl"
   />
-  <apn
-      carrier="Alfawap"
+  <apn carrier="Alfawap"
       mcc="415"
       mnc="01"
       apn="wap.mic1.com.lb"
@@ -23667,8 +21895,7 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="Alfa MMS"
+  <apn carrier="Alfa MMS"
       mcc="415"
       mnc="01"
       user="mic1"
@@ -23679,22 +21906,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="touch"
+  <apn carrier="touch"
       mcc="415"
       mnc="03"
       apn="touch"
       type="default,supl"
   />
-  <apn
-      carrier="MTC Touch GPRS"
+  <apn carrier="MTC Touch GPRS"
       mcc="415"
       mnc="03"
       apn="gprs.mtctouch.com.lb"
       type="default,supl"
   />
-  <apn
-      carrier="touch_WAP"
+    <apn carrier="touch_WAP"
       mcc="415"
       mnc="03"
       apn="wap"
@@ -23702,8 +21926,7 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="touch_MMS"
+  <apn carrier="touch_MMS"
       mcc="415"
       mnc="03"
       user="touch"
@@ -23713,8 +21936,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="MTC MMS"
+  <apn carrier="MTC MMS"
       mcc="415"
       mnc="03"
       user="mtctouch"
@@ -23724,8 +21946,8 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Zain JO Internet"
+
+  <apn carrier="Zain JO Internet"
       mcc="416"
       mnc="01"
       apn="zain"
@@ -23734,8 +21956,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Zain JO WAP"
+  <apn carrier="Zain JO WAP"
       mcc="416"
       mnc="01"
       apn="zain"
@@ -23746,15 +21967,13 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="Zain JO Internet Postpaid"
+  <apn carrier="Zain JO Internet Postpaid"
       mcc="416"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Zain JO Internet Prepaid"
+  <apn carrier="Zain JO Internet Prepaid"
       mcc="416"
       mnc="01"
       apn="internetpre"
@@ -23762,8 +21981,7 @@
       password="zain"
       type="default,supl"
   />
-  <apn
-      carrier="Zain JO Streaming"
+  <apn carrier="Zain JO Streaming"
       mcc="416"
       mnc="01"
       apn="Zain"
@@ -23772,8 +21990,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Zain JO MMS"
+  <apn carrier="Zain JO MMS"
       mcc="416"
       mnc="01"
       apn="zain"
@@ -23785,15 +22002,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Umniah internet"
+  <apn carrier="Umniah internet"
       mcc="416"
       mnc="03"
       apn="net"
       type="default,supl"
   />
-  <apn
-      carrier="umniah Prepaid"
+  <apn carrier="umniah Prepaid"
       mcc="416"
       mnc="03"
       apn="net"
@@ -23801,8 +22016,7 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="Umniah WAP"
+  <apn carrier="Umniah WAP"
       mcc="416"
       mnc="03"
       apn="wap"
@@ -23810,15 +22024,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="umniahinternet Postpaid"
+  <apn carrier="umniahinternet Postpaid"
       mcc="416"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Umniah MMS"
+  <apn carrier="Umniah MMS"
       mcc="416"
       mnc="03"
       apn="mms"
@@ -23827,12 +22039,10 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="416"
       mnc="77"
-      apn="mms.orange.jo"
-      authtype="1"
+      apn="mms.orange.jo" authtype="1"
       user="mmc"
       password="mmc"
       mmsc="http://172.16.1.96/servlets/mms"
@@ -23840,18 +22050,15 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="416"
       mnc="77"
-      apn="net.orange.jo"
-      authtype="1"
+      apn="net.orange.jo" authtype="1"
       user="net"
       password="net"
       type="default,supl"
   />
-  <apn
-      carrier="Orange WAP"
+  <apn carrier="Orange WAP"
       mcc="416"
       mnc="77"
       apn="wap.orange.jo"
@@ -23862,8 +22069,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="416"
       mnc="770"
       apn="mms.orange.jo"
@@ -23875,8 +22081,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="416"
       mnc="770"
       apn="net.orange.jo"
@@ -23885,8 +22090,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Orange WAP"
+  <apn carrier="Orange WAP"
       mcc="416"
       mnc="770"
       apn="wap.orange.jo"
@@ -23897,15 +22101,14 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Syriatel Net"
+
+  <apn carrier="Syriatel Net"
       mcc="417"
       mnc="01"
       apn="net.syriatel.com"
       type="default,supl"
   />
-  <apn
-      carrier="Syriatel MMS"
+  <apn carrier="Syriatel MMS"
       mcc="417"
       mnc="01"
       apn="mms.syriatel.com"
@@ -23914,15 +22117,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="MTN WAP"
+  <apn carrier="MTN WAP"
       mcc="417"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="MTN MMS"
+  <apn carrier="MTN MMS"
       mcc="417"
       mnc="02"
       apn="mms"
@@ -23931,15 +22132,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="Asiacell GPRS"
+  <apn carrier="Asiacell GPRS"
       mcc="418"
       mnc="05"
       apn="net.asiacell.com"
       type="default,supl"
   />
-  <apn
-      carrier="Asiacell MMS"
+  <apn carrier="Asiacell MMS"
       mcc="418"
       mnc="05"
       apn="wap.asiacell.com"
@@ -23948,15 +22147,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SanaTel"
+  <apn carrier="SanaTel"
       mcc="418"
       mnc="08"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="ZAIN-GPRS"
+  <apn carrier="ZAIN-GPRS"
       mcc="418"
       mnc="20"
       apn="internet"
@@ -23965,8 +22162,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Zain-MMS"
+  <apn carrier="Zain-MMS"
       mcc="418"
       mnc="20"
       apn="MMS"
@@ -23978,8 +22174,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="ZAIN-GPRS"
+  <apn carrier="ZAIN-GPRS"
       mcc="418"
       mnc="30"
       apn="internet"
@@ -23988,8 +22183,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Zain-MMS"
+  <apn carrier="Zain-MMS"
       mcc="418"
       mnc="30"
       apn="MMS"
@@ -24001,15 +22195,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Korek 9595"
+  <apn carrier="Korek 9595"
       mcc="418"
       mnc="40"
       apn="internet.korek.com"
       type="default,supl"
   />
-  <apn
-      carrier="Korek 9191"
+  <apn carrier="Korek 9191"
       mcc="418"
       mnc="40"
       apn="net.korek.com"
@@ -24017,15 +22209,13 @@
       password="korek"
       type="default,supl"
   />
-  <apn
-      carrier="Korek 9494"
+  <apn carrier="Korek 9494"
       mcc="418"
       mnc="40"
       apn="internet.korek.com"
       type="default,supl"
   />
-  <apn
-      carrier="KOREK MMS"
+  <apn carrier="KOREK MMS"
       mcc="418"
       mnc="40"
       apn="mms.korek.com"
@@ -24037,29 +22227,26 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Mobitel"
+  <apn carrier="Mobitel"
       mcc="418"
       mnc="45"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Itisaluna"
+  <apn carrier="Itisaluna"
       mcc="418"
       mnc="62"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Omnnea"
+  <apn carrier="Omnnea"
       mcc="418"
       mnc="92"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MI"
+
+  <apn carrier="MI"
       mcc="419"
       mnc="02"
       apn="pps"
@@ -24067,8 +22254,7 @@
       password="pps"
       type="default,supl"
   />
-  <apn
-      carrier="Zain WAP"
+  <apn carrier="Zain WAP"
       mcc="419"
       mnc="02"
       apn="pps"
@@ -24079,8 +22265,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       authtype="3"
       mcc="419"
       mnc="02"
@@ -24092,16 +22277,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet Action"
+ <apn carrier="Internet Action"
       mcc="419"
       mnc="03"
       apn="action.wataniya.com"
       authtype="0"
       type="default,supl"
   />
-  <apn
-      carrier="Wataniya MMS"
+  <apn carrier="Wataniya MMS"
       authtype="0"
       mcc="419"
       mnc="03"
@@ -24111,8 +22294,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="VIVA - KW"
+  <apn carrier="VIVA - KW"
       mcc="419"
       mnc="04"
       apn="viva"
@@ -24122,15 +22304,14 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="STC - GPRS"
+
+  <apn carrier="STC - GPRS"
       mcc="420"
       mnc="01"
       apn="jawalnet.com.sa"
       type="default,supl"
   />
-  <apn
-      carrier="STC MMS"
+  <apn carrier="STC MMS"
       mcc="420"
       mnc="01"
       apn="mms.net.sa"
@@ -24139,15 +22320,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Mobily WEB"
+  <apn carrier="Mobily WEB"
       mcc="420"
       mnc="03"
       apn="web1"
       type="default,supl"
   />
-  <apn
-      carrier="Mobily prepaid - GPRS"
+  <apn carrier="Mobily prepaid - GPRS"
       mcc="420"
       mnc="03"
       apn="wap2"
@@ -24155,8 +22334,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Mobily postpaid - GPRS"
+  <apn carrier="Mobily postpaid - GPRS"
       mcc="420"
       mnc="03"
       apn="wap1"
@@ -24164,15 +22342,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Mobily WEB 2"
+  <apn carrier="Mobily WEB 2"
       mcc="420"
       mnc="03"
       apn="web2"
       type="default,supl"
   />
-  <apn
-      carrier="Mobily MMS Postpaid"
+<apn carrier="Mobily MMS Postpaid"
       mcc="420"
       mnc="03"
       apn="mms1"
@@ -24181,8 +22357,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Mobily MMS Prepaid"
+<apn carrier="Mobily MMS Prepaid"
       mcc="420"
       mnc="03"
       apn="mms2"
@@ -24191,26 +22366,22 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="mobily Net Postpaid"
+  <apn carrier="mobily Net Postpaid"
       mcc="420"
       mnc="03"
       apn="web1"
       type="default,supl"
   />
-  <apn
-      carrier="zain-Internet Wap"
+  <apn carrier="zain-Internet Wap"
       authtype="0"
       mcc="420"
       mnc="04"
       apn="zain"
       type="default,supl"
   />
-  <apn
-      carrier="zain-mms"
+  <apn carrier="zain-mms"
       mcc="420"
-      mnc="04"
-      protocol="IP"
+      mnc="04" protocol="IP"
       roaming_protocol="IP"
       apn="zainmms"
       mmsc="http://10.122.200.12:8002"
@@ -24218,15 +22389,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SabaFon"
+
+  <apn carrier="SabaFon"
       mcc="421"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Sabafon MMS"
+  <apn carrier="Sabafon MMS"
       mcc="421"
       mnc="01"
       apn="mms"
@@ -24238,15 +22408,13 @@
       mmsc="http://mms.sabafon.com/"
       mmsport="8080"
   />
-  <apn
-      carrier="MTN"
+  <apn carrier="MTN"
       mcc="421"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN MMS YE"
+  <apn carrier="MTN MMS YE"
       mcc="421"
       mnc="02"
       apn="fast-mms"
@@ -24257,22 +22425,20 @@
       mmsc="http://192.168.97.1/mmsc"
       mmsport="3130"
   />
-  <apn
-      carrier="Yemen Mobile"
+  <apn carrier="Yemen Mobile"
       mcc="421"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="HiTS-UNITEL"
+  <apn carrier="HiTS-UNITEL"
       mcc="421"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Oman Mobile MMS"
+
+  <apn carrier="Oman Mobile MMS"
       mcc="422"
       mnc="02"
       apn="mms"
@@ -24284,8 +22450,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Oman Mobile Internet"
+  <apn carrier="Oman Mobile Internet"
       mcc="422"
       mnc="02"
       apn="taif"
@@ -24294,8 +22459,7 @@
       password="taif"
       type="default,supl"
   />
-  <apn
-      carrier="Nawras MMS"
+  <apn carrier="Nawras MMS"
       mcc="422"
       mnc="03"
       apn="mms.nawras.com.om"
@@ -24307,8 +22471,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Nawras Internet"
+  <apn carrier="Nawras Internet"
       mcc="422"
       mnc="03"
       apn="isp.nawras.com.om"
@@ -24317,16 +22480,15 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Etisalat Data Package"
+
+  <apn carrier="Etisalat Data Package"
       mcc="424"
       mnc="02"
       apn="etisalat.ae"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Weyak Wap"
+  <apn carrier="Weyak Wap"
       mcc="424"
       mnc="02"
       apn="etisalat"
@@ -24335,8 +22497,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Etisalat MMS"
+  <apn carrier="Etisalat MMS"
       mcc="424"
       mnc="02"
       apn="etisalat"
@@ -24346,22 +22507,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="DATA Package"
+  <apn carrier="DATA Package"
       mcc="424"
       mnc="02"
       apn="etisalat.ae"
       type="default,supl"
   />
-  <apn
-      carrier="du Internet"
+  <apn carrier="du Internet"
       mcc="424"
       mnc="03"
       apn="du"
       type="default,supl"
   />
-  <apn
-      carrier="du WAP"
+  <apn carrier="du WAP"
       mcc="424"
       mnc="03"
       apn="du"
@@ -24369,8 +22527,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="du MMS"
+  <apn carrier="du MMS"
       mcc="424"
       mnc="03"
       apn="du"
@@ -24379,8 +22536,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="3G Portal"
+
+  <apn carrier="3G Portal"
       mcc="425"
       mmsc="http://192.168.220.15/servlets/mms"
       mmsport="8080"
@@ -24388,8 +22545,7 @@
       apn="uwap.orange.co.il"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3G DUN"
+  <apn carrier="3G DUN"
       mcc="425"
       mnc="01"
       apn="modem.orange.net.il"
@@ -24397,15 +22553,13 @@
       authtype="0"
       port="8080"
   />
-  <apn
-      carrier="Cellcom Internet"
+  <apn carrier="Cellcom Internet"
       mcc="425"
       mnc="02"
       apn="sphone"
       type="default,supl"
   />
-  <apn
-      carrier="Cellcom MMS"
+    <apn carrier="Cellcom MMS"
       mcc="425"
       mnc="02"
       apn="mms"
@@ -24414,8 +22568,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MMS 3G"
+  <apn carrier="MMS 3G"
       mcc="425"
       mnc="01"
       apn="uwap.orange.co.il"
@@ -24423,8 +22576,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Multimedia Pelephone"
+  <apn carrier="Multimedia Pelephone"
       mcc="425"
       mnc="03"
       apn="mms.pelephone.net.il"
@@ -24436,8 +22588,7 @@
       mmsport="9093"
       type="mms"
   />
-  <apn
-      carrier="Sphone Pelephone"
+  <apn carrier="Sphone Pelephone"
       mcc="425"
       mnc="03"
       apn="sphone.pelephone.net.il"
@@ -24446,22 +22597,19 @@
       authtype="2"
       type="default,supl"
   />
-  <apn
-      carrier="Internet 3G"
+  <apn carrier="Internet 3G"
       mcc="425"
       mnc="01"
       apn="modem.orange.net.il"
       type="default,supl"
   />
-  <apn
-      carrier="Cellcom Internet"
+  <apn carrier="Cellcom Internet"
       mcc="425"
       mnc="02"
       apn="Sphone"
       type="default,supl"
   />
-  <apn
-      carrier="Cellcom MMS"
+  <apn carrier="Cellcom MMS"
       mcc="425"
       mnc="02"
       apn="mms"
@@ -24470,8 +22618,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Multimedia Pelephone"
+  <apn carrier="Multimedia Pelephone"
       mcc="425"
       mnc="03"
       apn="mms.pelephone.net.il"
@@ -24482,8 +22629,7 @@
       mmsport="9093"
       type="mms"
   />
-  <apn
-      carrier="Sphone Pelephone"
+  <apn carrier="Sphone Pelephone"
       mcc="425"
       mnc="03"
       apn="sphone.pelephone.net.il"
@@ -24491,8 +22637,7 @@
       password="pcl"
       type="default,supl"
   />
-  <apn
-      carrier="Jawwal WAP"
+  <apn carrier="Jawwal WAP"
       mcc="425"
       mnc="05"
       apn="wap"
@@ -24500,8 +22645,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Jawwal MMS"
+  <apn carrier="Jawwal MMS"
       mcc="425"
       mnc="05"
       apn="mms"
@@ -24510,8 +22654,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="425"
       mnc="06"
       apn="internet"
@@ -24519,8 +22662,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Wataniya_mms"
+  <apn carrier="Wataniya_mms"
       mcc="425"
       mnc="06"
       apn="mms"
@@ -24529,23 +22671,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet HOT mobile"
+  <apn carrier="Internet HOT mobile"
       mcc="425"
       mnc="07"
       apn="net.hotm"
       type="default,supl"
   />
-  <apn
-      carrier="PC HOT mobile"
+  <apn carrier="PC HOT mobile"
       mcc="425"
       mnc="07"
       apn="pc.hotm"
       type="dun"
       authtype="0"
   />
-  <apn
-      carrier="MMS HOT mobile"
+  <apn carrier="MMS HOT mobile"
       mcc="425"
       mnc="07"
       apn="mms.hotm"
@@ -24554,15 +22693,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="GolanTelecom Internet"
+  <apn carrier="GolanTelecom Internet"
       mcc="425"
       mnc="08"
       apn="internet.golantelecom.net.il"
       type="default,supl"
   />
-  <apn
-      carrier="GolanTelecom MMS"
+  <apn carrier="GolanTelecom MMS"
       mcc="425"
       mnc="08"
       apn="mms.golantelecom.net.il"
@@ -24571,8 +22708,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="3G Portal"
+  <apn carrier="3G Portal"
       mcc="425"
       mnc="10"
       apn="uwap.orange.co.il"
@@ -24580,23 +22716,20 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Alon Internet"
+  <apn carrier="Alon Internet"
       mcc="425"
       mnc="14"
       apn="data.youphone.co.il"
       mmsc="http://192.168.220.15/servlets/mms"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Home Cellular Internet"
+  <apn carrier="Home Cellular Internet"
       mcc="425"
       mnc="15"
       apn="hcminternet"
       type="default,supl"
   />
-  <apn
-      carrier="Home Cellular MMS"
+  <apn carrier="Home Cellular MMS"
       mcc="425"
       mnc="15"
       apn="hcmMMS"
@@ -24605,15 +22738,13 @@
       mmsport="8898"
       type="mms"
   />
-  <apn
-      carrier="Rami Levi 3G"
+  <apn carrier="Rami Levi 3G"
       mcc="425"
       mnc="16"
       apn="internet.rl"
       type="default,supl"
   />
-  <apn
-      carrier="Rami Levi Multimedia"
+  <apn carrier="Rami Levi Multimedia"
       mcc="425"
       mnc="16"
       apn="mms.pelephone.net.il"
@@ -24622,15 +22753,14 @@
       mmsport="9093"
       type="mms"
   />
-  <apn
-      carrier="Batelco Internet"
+
+  <apn carrier="Batelco Internet"
       mcc="426"
       mnc="01"
       apn="internet.batelco.com"
       type="default,supl"
   />
-  <apn
-      carrier="Batelco WAP"
+  <apn carrier="Batelco WAP"
       mcc="426"
       mnc="01"
       apn="wap.batelco.com"
@@ -24641,8 +22771,7 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="Batelco MMS"
+  <apn carrier="Batelco MMS"
       mcc="426"
       mnc="01"
       apn="mms.batelco.com"
@@ -24654,8 +22783,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Zain BH Internet"
+  <apn carrier="Zain BH Internet"
       mcc="426"
       mnc="02"
       apn="internet"
@@ -24664,8 +22792,7 @@
       authtype="0"
       type="default,supl"
   />
-  <apn
-      carrier="Zain BH WAP"
+    <apn carrier="Zain BH WAP"
       mcc="426"
       mnc="02"
       apn="wap"
@@ -24676,8 +22803,7 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="Zain Internet"
+  <apn carrier="Zain Internet"
       mcc="426"
       mnc="02"
       apn="connect.mobilinkworld.com"
@@ -24685,8 +22811,7 @@
       password="Mobilink"
       type="default,supl"
   />
-  <apn
-      carrier="Zain BH MMS"
+  <apn carrier="Zain BH MMS"
       mcc="426"
       mnc="02"
       apn="mms"
@@ -24698,15 +22823,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="VIVAGPRS"
+  <apn carrier="VIVAGPRS"
       mcc="426"
       mnc="04"
       apn="viva.bh"
       type="default,supl"
   />
-  <apn
-      carrier="VIVAWAP"
+ <apn carrier="VIVAWAP"
       mcc="426"
       mnc="04"
       apn="vivawap.bh"
@@ -24714,8 +22837,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="VIVAMMS"
+  <apn carrier="VIVAMMS"
       mcc="426"
       mnc="04"
       apn="vivawap.bh"
@@ -24724,8 +22846,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Mozaic Mob"
+
+  <apn carrier="Mozaic Mob"
       mcc="427"
       mnc="01"
       apn="gprs.qtel"
@@ -24736,8 +22858,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Qtel MMS"
+  <apn carrier="Qtel MMS"
       mcc="427"
       mnc="01"
       apn="mms.qtel"
@@ -24749,15 +22870,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Voda internet"
+  <apn carrier="Voda internet"
       mcc="427"
       mnc="02"
       apn="web.vodafone.com.qa"
       type="default,supl"
   />
-  <apn
-      carrier="Qtel GPRS"
+  <apn carrier="Qtel GPRS"
       mcc="427"
       mnc="01"
       apn="gprs.qtel"
@@ -24767,8 +22886,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="VFQ MMS"
+  <apn carrier="VFQ MMS"
       mcc="427"
       mnc="02"
       apn="vodafone.com.qa"
@@ -24777,64 +22895,58 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Unitel"
+
+  <apn carrier="Unitel"
       mcc="428"
       mnc="88"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Skytel"
+  <apn carrier="Skytel"
       mcc="428"
       mnc="91"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="G.Mobile"
+  <apn carrier="G.Mobile"
       mcc="428"
       mnc="98"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MobiCom"
+  <apn carrier="MobiCom"
       mcc="428"
       mnc="99"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Namaste / NT Mobile"
+
+  <apn carrier="Namaste / NT Mobile"
       mcc="429"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Ncell"
+  <apn carrier="Ncell"
       mcc="429"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Sky/C-Phone"
+  <apn carrier="Sky/C-Phone"
       mcc="429"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="SmartCell"
+  <apn carrier="SmartCell"
       mcc="429"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline-UZB Internet"
+
+  <apn carrier="Beeline-UZB Internet"
       mcc="434"
       mnc="04"
       apn="internet.beeline.uz"
@@ -24843,8 +22955,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline-UZB MMS"
+  <apn carrier="Beeline-UZB MMS"
       mcc="434"
       mnc="04"
       apn="mms.beeline.uz"
@@ -24856,15 +22967,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="UCELL Internet"
+  <apn carrier="UCELL Internet"
       mcc="434"
       mnc="05"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="UCELL MMS"
+  <apn carrier="UCELL MMS"
       mcc="434"
       mnc="05"
       apn="mms"
@@ -24873,15 +22982,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Perfectum Mobile"
+  <apn carrier="Perfectum Mobile"
       mcc="434"
       mnc="06"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTS-UZB Internet"
+  <apn carrier="MTS-UZB Internet"
       mcc="434"
       mnc="07"
       apn="net.mts.uz"
@@ -24890,8 +22997,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MTS-UZB MMS"
+  <apn carrier="MTS-UZB MMS"
       mcc="434"
       mnc="07"
       apn="mms.mts.uz"
@@ -24900,15 +23006,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MCI-GPRS"
+  <apn carrier="MCI-GPRS"
       mcc="432"
       mnc="11"
       apn="mcinet"
       type="default,supl"
   />
-  <apn
-      carrier="MCCI MMS"
+  <apn carrier="MCCI MMS"
       mcc="432"
       mnc="11"
       apn="mcinet"
@@ -24917,15 +23021,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MCI-GPRS"
+  <apn carrier="MCI-GPRS"
       mcc="432"
       mnc="14"
       apn="mcinet"
       type="default,supl"
   />
-  <apn
-      carrier="MCCI MMS"
+  <apn carrier="MCCI MMS"
       mcc="432"
       mnc="14"
       apn="MCI-GPRS"
@@ -24933,15 +23035,13 @@
       mmsc="http://192.168.193.134"
       type="mms"
   />
-  <apn
-      carrier="MCI-GPRS"
+  <apn carrier="MCI-GPRS"
       mcc="432"
       mnc="19"
       apn="mcinet"
       type="default,supl"
   />
-  <apn
-      carrier="MCCI MMS"
+  <apn carrier="MCCI MMS"
       mcc="432"
       mnc="19"
       apn="MCI-GPRS"
@@ -24949,15 +23049,13 @@
       mmsc="http://192.168.193.134"
       type="mms"
   />
-  <apn
-      carrier="rightel"
+  <apn carrier="rightel"
       mcc="432"
       mnc="20"
       apn="rightel"
       type="default,supl"
   />
-  <apn
-      carrier="RighTel-MMS"
+  <apn carrier="RighTel-MMS"
       mcc="432"
       mnc="20"
       apn="RighTel-WAP"
@@ -24966,8 +23064,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Irancell-GPRS"
+  <apn carrier="Irancell-GPRS"
       mcc="432"
       mnc="35"
       apn="mtnirancell"
@@ -24975,8 +23072,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Irancell-MMS"
+  <apn carrier="Irancell-MMS"
       mcc="432"
       mnc="35"
       apn="mtnirancell"
@@ -24985,15 +23081,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MCI-GPRS"
+  <apn carrier="MCI-GPRS"
       mcc="432"
       mnc="70"
       apn="mcinet"
       type="default,supl"
   />
-  <apn
-      carrier="MCCI MMS"
+  <apn carrier="MCCI MMS"
       mcc="432"
       mnc="70"
       apn="mcinet"
@@ -25002,15 +23096,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MCI-GPRS"
+  <apn carrier="MCI-GPRS"
       mcc="432"
       mnc="93"
       apn="mcinet"
       type="default,supl"
   />
-  <apn
-      carrier="MCCI MMS"
+  <apn carrier="MCCI MMS"
       mcc="432"
       mnc="93"
       apn="MCI-GPRS"
@@ -25018,93 +23110,84 @@
       mmsc="http://192.168.193.134"
       type="mms"
   />
-  <apn
-      carrier="Tcell"
+
+  <apn carrier="Tcell"
       mcc="436"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tcell"
+  <apn carrier="Tcell"
       mcc="436"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Megafon"
+  <apn carrier="Megafon"
       mcc="436"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Babilon-M"
+  <apn carrier="Babilon-M"
       mcc="436"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tacom"
+  <apn carrier="Tacom"
       mcc="436"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tcell"
+  <apn carrier="Tcell"
       mcc="436"
       mnc="12"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline"
+
+  <apn carrier="Beeline"
       mcc="437"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Fonex"
+  <apn carrier="Fonex"
       mcc="437"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MegaCom"
+  <apn carrier="MegaCom"
       mcc="437"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="O!"
+  <apn carrier="O!"
       mcc="437"
       mnc="09"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTS (BARASH Communication)"
+
+  <apn carrier="MTS (BARASH Communication)"
       mcc="438"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="TM-Cell"
+  <apn carrier="TM-Cell"
       mcc="438"
       mnc="02"
       apn="default"
       type="default,supl"
   />
+
   <!-- APNs for Japanese phone carriers -->
-  <apn
-      carrier="mopera U"
+  <apn carrier="mopera U"
       mcc="440"
       mnc="10"
       apn="mopera.net"
@@ -25113,8 +23196,7 @@
       password=""
       type="default,supl"
   />
-  <apn
-      carrier="b-mobile for Nexus"
+  <apn carrier="b-mobile for Nexus"
       mcc="440"
       mnc="10"
       apn="bmobile.ne.jp"
@@ -25124,8 +23206,7 @@
       authtype="3"
       type="default,supl"
   />
-  <apn
-      carrier="b-mobile 3G・4G 1GB/Fair"
+  <apn carrier="b-mobile 3G・4G 1GB/Fair"
       mcc="440"
       mnc="10"
       apn="bmobile.ne.jp"
@@ -25135,8 +23216,7 @@
       authtype="3"
       type="default,supl"
   />
-  <apn
-      carrier="b-mobile 3G・4G U300"
+  <apn carrier="b-mobile 3G・4G U300"
       mcc="440"
       mnc="10"
       apn="bmobile.ne.jp"
@@ -25146,8 +23226,7 @@
       authtype="3"
       type="default,supl"
   />
-  <apn
-      carrier="b-mobile スマホ電話"
+  <apn carrier="b-mobile スマホ電話"
       mcc="440"
       mnc="10"
       apn="bmobile.ne.jp"
@@ -25157,8 +23236,7 @@
       authtype="3"
       type="default,supl"
   />
-  <apn
-      carrier="b-mobile 4G カメレオンSIM"
+  <apn carrier="b-mobile 4G カメレオンSIM"
       mcc="440"
       mnc="10"
       apn="bmobile.ne.jp"
@@ -25168,8 +23246,7 @@
       authtype="3"
       type="default,supl"
   />
-  <apn
-      carrier="IIJmio (LTE端末)"
+  <apn carrier="IIJmio (LTE端末)"
       mcc="440"
       mnc="10"
       apn="iijmio.jp"
@@ -25180,8 +23257,7 @@
       protocol="IPV4V6"
       type="default,supl"
   />
-  <apn
-      carrier="IIJmio (3G端末)"
+    <apn carrier="IIJmio (3G端末)"
       mcc="440"
       mnc="10"
       apn="iijmio.jp"
@@ -25191,8 +23267,7 @@
       authtype="3"
       type="default,supl"
   />
-  <apn
-      carrier="spモード"
+  <apn carrier="spモード"
       mcc="440"
       mnc="10"
       apn="spmode.ne.jp"
@@ -25202,8 +23277,7 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="OCN モバイル ONE (3G)"
+ <apn carrier="OCN モバイル ONE (3G)"
       mcc="440"
       mnc="10"
       apn="3g-d-2.ocn.ne.jp"
@@ -25213,8 +23287,7 @@
       authtype="2"
       type="default,supl"
   />
-  <apn
-      carrier="OCN モバイル ONE (LTE)"
+    <apn carrier="OCN モバイル ONE (LTE)"
       mcc="440"
       mnc="10"
       apn="lte-d.ocn.ne.jp"
@@ -25224,8 +23297,7 @@
       authtype="2"
       type="default,supl"
   />
-  <apn
-      carrier="mopera U（スマートフォン定額）"
+  <apn carrier="mopera U（スマートフォン定額）"
       mcc="440"
       mnc="10"
       apn="mpr2.bizho.net"
@@ -25235,8 +23307,7 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="OCN モバイル ONE (LTE)"
+  <apn carrier="OCN モバイル ONE (LTE)"
       mcc="440"
       mnc="10"
       apn="lte-d.ocn.ne.jp"
@@ -25246,8 +23317,7 @@
       authtype="2"
       type="default,supl"
   />
-  <apn
-      carrier="mopera U設定"
+  <apn carrier="mopera U設定"
       mcc="440"
       mnc="10"
       apn="0120.mopera.net"
@@ -25257,15 +23327,13 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="440"
       mnc="10"
       apn="ims"
       type="ims"
   />
-  <apn
-      carrier="Application"
+  <apn carrier="Application"
       mcc="440"
       mnc="20"
       apn="plus.acs.jp"
@@ -25277,8 +23345,8 @@
       type="default,mms,supl,hipri"
       authtype="2"
   />
-  <apn
-      carrier="SKT LTE INTERNET"
+
+  <apn carrier="SKT LTE INTERNET"
       mcc="450"
       mnc="05"
       apn="lte.sktelecom.com"
@@ -25288,8 +23356,7 @@
       mmsport="9093"
       server="*"
   />
-  <apn
-      carrier="SKT 3G INTERNET"
+  <apn carrier="SKT 3G INTERNET"
       mcc="450"
       mnc="05"
       apn="web.sktelecom.com"
@@ -25299,8 +23366,7 @@
       type="default,mms,supl,fota,cbs"
       server="*"
   />
-  <apn
-      carrier="SKT_Emergency"
+  <apn carrier="SKT_Emergency"
       mcc="450"
       mnc="05"
       apn="sos"
@@ -25308,8 +23374,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="SKT LTE Roaming"
+  <apn carrier="SKT LTE Roaming"
       mcc="450"
       mnc="05"
       apn="lte-roaming.sktelecom.com"
@@ -25319,8 +23384,7 @@
       type="default,mms,supl,fota,cbs"
       server="*"
   />
-  <apn
-      carrier="SKT 3G Roaming"
+  <apn carrier="SKT 3G Roaming"
       mcc="450"
       mnc="05"
       apn="roaming.sktelecom.com"
@@ -25330,8 +23394,7 @@
       type="default,mms,supl,fota,cbs"
       server="*"
   />
-  <apn
-      carrier="LG uplus IMS"
+  <apn carrier="LG uplus IMS"
       mcc="450"
       mnc="06"
       apn="ims.lguplus.co.kr"
@@ -25339,8 +23402,7 @@
       mmsc="http://omammsc.uplus.co.kr:9084"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="LG uplus"
+  <apn carrier="LG uplus"
       mcc="450"
       mnc="06"
       apn="internet.lguplus.co.kr"
@@ -25348,24 +23410,21 @@
       mmsc="http://omammsc.uplus.co.kr:9084"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="LG uplus LTE Roaming"
+  <apn carrier="LG uplus LTE Roaming"
       mcc="450"
       mnc="06"
       apn="lte-roaming.lguplus.co.kr"
       mmsc="http://omammsc.uplus.co.kr:9084"
       authtype="0"
   />
-  <apn
-      carrier="LG uplus Roaming"
+  <apn carrier="LG uplus Roaming"
       mcc="450"
       mnc="06"
       apn="wroaming.lguplus.co.kr"
       mmsc="http://omammsc.uplus.co.kr:9084"
       authtype="0"
   />
-  <apn
-      carrier="KT LTE INTERNET"
+  <apn carrier="KT LTE INTERNET"
       mcc="450"
       mnc="08"
       apn="lte150.ktfwing.com"
@@ -25374,8 +23433,7 @@
       port="80"
       server="*"
   />
-  <apn
-      carrier="KT 3G INTERNET"
+  <apn carrier="KT 3G INTERNET"
       mcc="450"
       mnc="08"
       apn="alwayson-r6.ktfwing.com"
@@ -25384,16 +23442,14 @@
       port="80"
       server="*"
   />
-  <apn
-      carrier="KT"
+  <apn carrier="KT"
       mcc="450"
       mnc="08"
       apn="lte.ktfwing.com"
       mmsc="http://mmsc.ktfwing.com:9082"
       server="*"
   />
-  <apn
-      carrier="SKT 3G INTERNET"
+  <apn carrier="SKT 3G INTERNET"
       mcc="450"
       mnc="11"
       apn="web.sktelecom.com"
@@ -25403,8 +23459,7 @@
       mmsport="9093"
       server="*"
   />
-  <apn
-      carrier="SKT LTE Roaming"
+  <apn carrier="SKT LTE Roaming"
       mcc="450"
       mnc="11"
       apn="lte-roaming.sktelecom.com"
@@ -25413,8 +23468,7 @@
       mmsport="9093"
       server="*"
   />
-  <apn
-      carrier="SKT 3G Roaming"
+  <apn carrier="SKT 3G Roaming"
       mcc="450"
       mnc="11"
       apn="roaming.sktelecom.com"
@@ -25423,8 +23477,8 @@
       mmsport="9093"
       server="*"
   />
-  <apn
-      carrier="Mobi-wap-gprs 2"
+
+  <apn carrier="Mobi-wap-gprs 2"
       mcc="452"
       mnc="01"
       apn="m-wap"
@@ -25433,8 +23487,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Mobi-wap-gprs 1"
+  <apn carrier="Mobi-wap-gprs 1"
       mcc="452"
       mnc="01"
       apn="m-wap"
@@ -25445,8 +23498,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Mobi-gprs-mms"
+  <apn carrier="Mobi-gprs-mms"
       authtype="1"
       mcc="452"
       mnc="01"
@@ -25458,8 +23510,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="VN MOBIFONE Email"
+  <apn carrier="VN MOBIFONE Email"
       mcc="452"
       mnc="01"
       apn="m-wap"
@@ -25467,8 +23518,7 @@
       password="mms"
       type="default,supl"
   />
-  <apn
-      carrier="Vina-wap-gprs"
+  <apn carrier="Vina-wap-gprs"
       mcc="452"
       mnc="02"
       apn="m3-world"
@@ -25477,8 +23527,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Vinaphone Email"
+  <apn carrier="Vinaphone Email"
       mcc="452"
       mnc="02"
       apn="m3-world"
@@ -25486,9 +23535,7 @@
       password="mms"
       type="default,supl"
   />
-  <apn
-      carrier="Vina-gprs-mms"
-      authtype="1"
+  <apn carrier="Vina-gprs-mms" authtype="1"
       mcc="452"
       mnc="02"
       apn="m3-mms"
@@ -25499,15 +23546,13 @@
       mmsport="8000"
       type="mms"
   />
-  <apn
-      carrier="Viettel-wap-gprs 1"
+   <apn carrier="Viettel-wap-gprs 1"
       mcc="452"
       mnc="04"
       apn="v-internet"
       type="default,supl"
   />
-  <apn
-      carrier="Viettel-wap-gprs 2"
+  <apn carrier="Viettel-wap-gprs 2"
       mcc="452"
       mnc="04"
       apn="v-wap"
@@ -25515,8 +23560,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Viettel-gprs-mms"
+  <apn carrier="Viettel-gprs-mms"
       mcc="452"
       mnc="04"
       apn="v-mms"
@@ -25525,15 +23569,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vietnamobile_GPRS3"
+  <apn carrier="Vietnamobile_GPRS3"
       mcc="452"
       mnc="05"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Vietnamobile_GPRS1"
+  <apn carrier="Vietnamobile_GPRS1"
       mcc="452"
       mnc="05"
       apn="wap"
@@ -25541,15 +23583,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vietnamobile_GPRS2"
+  <apn carrier="Vietnamobile_GPRS2"
       mcc="452"
       mnc="05"
       apn="wap"
       type="default,supl"
   />
-  <apn
-      carrier="Vietnamobile_MMS"
+  <apn carrier="Vietnamobile_MMS"
       mcc="452"
       mnc="05"
       apn="mms"
@@ -25558,24 +23598,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Gmobile-wap-gprs2"
+  <apn carrier="Gmobile-wap-gprs2"
       mcc="452"
       mnc="07"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Gmobile-wap-gprs"
+  <apn carrier="Gmobile-wap-gprs"
       mcc="452"
-      mnc="07"
-      proxy="10.16.70.199"
+      mnc="07" proxy="10.16.70.199"
       port="8080"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Gmobile-gprs-mms"
+  <apn carrier="Gmobile-gprs-mms"
       mcc="452"
       mnc="07"
       apn="mms"
@@ -25584,9 +23620,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Gmobile MMS"
-      authtype="2"
+  <apn carrier="Gmobile MMS" authtype="2"
       mcc="452"
       mnc="07"
       apn="mms"
@@ -25597,15 +23631,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="e-internet"
+  <apn carrier="e-internet"
       mcc="452"
       mnc="08"
       apn="e-internet"
       type="default,supl"
   />
-  <apn
-      carrier="e-wap"
+  <apn carrier="e-wap"
       mcc="452"
       mnc="08"
       apn="e-wap"
@@ -25613,8 +23645,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="e-mms"
+  <apn carrier="e-mms"
       mcc="452"
       mnc="08"
       apn="e-mms"
@@ -25623,8 +23654,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CTExcel"
+
+  <apn carrier="CTExcel"
       apn="CTExcel"
       mcc="454"
       mnc="00"
@@ -25635,8 +23666,7 @@
       mvno_type="iccid"
       mvno_match_data="8985231"
   />
-  <apn
-      carrier="CTExcel (IMS)"
+  <apn carrier="CTExcel (IMS)"
       apn="IMS"
       mcc="454"
       mnc="00"
@@ -25647,8 +23677,7 @@
       mvno_type="iccid"
       mvno_match_data="8985231"
   />
-  <apn
-      carrier="1O1O"
+  <apn carrier="1O1O"
       mcc="454"
       mnc="00"
       apn="mobile"
@@ -25658,8 +23687,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="NWMOBILE"
+  <apn carrier="NWMOBILE"
       mcc="454"
       mnc="00"
       apn="NWMOBILE"
@@ -25669,8 +23697,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="CSL Data"
+  <apn carrier="CSL Data"
       mcc="454"
       mnc="00"
       apn="hkcsl"
@@ -25679,8 +23706,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="1O1O"
+ <apn carrier="1O1O"
       mcc="454"
       mnc="02"
       apn="mobile"
@@ -25690,8 +23716,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="NWMOBILE"
+  <apn carrier="NWMOBILE"
       mcc="454"
       mnc="02"
       apn="NWMOBILE"
@@ -25701,8 +23726,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="CSL Data"
+  <apn carrier="CSL Data"
       mcc="454"
       mnc="02"
       apn="hkcsl"
@@ -25711,8 +23735,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3 LTE"
+  <apn carrier="3 LTE"
       mcc="454"
       mnc="03"
       apn="mobile.lte.three.com.hk"
@@ -25722,23 +23745,20 @@
       bearer_bitmask="14|19"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3 emergency"
+  <apn carrier="3 emergency"
       mcc="454"
       mnc="03"
       apn="sos.lte.three.com.hk"
       type="emergency"
   />
-  <apn
-      carrier="3 IMS"
+  <apn carrier="3 IMS"
       mcc="454"
       mnc="03"
       apn="ims.lte.three.com.hk"
       bearer_bitmask="14|19"
       type="ims"
   />
-  <apn
-      carrier="3 IWLAN MMS"
+  <apn carrier="3 IWLAN MMS"
       mcc="454"
       mnc="03"
       apn="vas.wlan.three.com.hk"
@@ -25748,8 +23768,7 @@
       bearer_bitmask="18"
       type="mms"
   />
-  <apn
-      carrier="3 MMS"
+  <apn carrier="3 MMS"
       mcc="454"
       mnc="03"
       apn="mobile.three.com.hk"
@@ -25759,8 +23778,7 @@
       bearer_bitmask="1|2|3|4|5|6|7|8|9|10|11|12|13|15|16|17|20"
       type="mms"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="454"
       mnc="03"
       apn="mobile.three.com.hk"
@@ -25768,8 +23786,7 @@
       bearer="18"
       type="default,supl"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="454"
       mnc="03"
@@ -25784,8 +23801,7 @@
       mvno_type="iccid"
       mvno_match_data="8985302,8985307,898603,898611"
   />
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="454"
@@ -25796,8 +23812,7 @@
       mvno_type="iccid"
       mvno_match_data="8985302,8985307,898603,898611"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="454"
       mnc="04"
@@ -25812,8 +23827,7 @@
       mvno_type="iccid"
       mvno_match_data="8985302,8985307,898603,898611"
   />
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="454"
@@ -25824,8 +23838,7 @@
       mvno_type="iccid"
       mvno_match_data="8985302,8985307,898603,898611"
   />
-  <apn
-      carrier="3-DB-MMS"
+  <apn carrier="3-DB-MMS"
       mcc="454"
       mnc="04"
       apn="mms-g.three.com.hk"
@@ -25834,8 +23847,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="3-DB-GPRS"
+  <apn carrier="3-DB-GPRS"
       mcc="454"
       mnc="04"
       apn="web-g.three.com.hk"
@@ -25843,8 +23855,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="3 (2G) MMS"
+  <apn carrier="3 (2G) MMS"
       apn="mms-g.three.com.hk"
       mcc="454"
       mnc="04"
@@ -25858,8 +23869,7 @@
       mmsc="http://10.30.15.51:10021/mmsc"
       type="mms"
   />
-  <apn
-      carrier="3 (2G)"
+  <apn carrier="3 (2G)"
       apn="web-g.three.com.hk"
       mcc="454"
       mnc="04"
@@ -25873,8 +23883,7 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="SMC-Voda"
+  <apn carrier="SMC-Voda"
       apn="SmarTone-Vodafone"
       mcc="454"
       mnc="06"
@@ -25888,8 +23897,7 @@
       mmsc="http://mms.smartone-vodafone.com/server"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SmarTone"
+  <apn carrier="SmarTone"
       mcc="454"
       mnc="06"
       apn="SmarTone"
@@ -25898,8 +23906,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SMC-Voda Internet"
+  <apn carrier="SMC-Voda Internet"
       apn="SmarTone-Vodafone"
       mcc="454"
       mnc="06"
@@ -25913,8 +23920,7 @@
       mmsc="http://mms.smartone-vodafone.com/server"
       type="default,supl,mms"
   />
-  <apn
-      carrier="China Unicom (HK)"
+  <apn carrier="China Unicom (HK)"
       mcc="454"
       mnc="07"
       apn="3gnet"
@@ -25923,8 +23929,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Unicom (HK)"
+  <apn carrier="China Unicom (HK)"
       mcc="454"
       mnc="07"
       apn="hkw"
@@ -25935,8 +23940,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Unicom (HK)"
+  <apn carrier="China Unicom (HK)"
       mcc="454"
       mnc="07"
       apn="cuhkiot"
@@ -25947,15 +23951,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="454"
       mnc="08"
       apn="truphone.com"
       type="default,supl"
   />
-  <apn
-      carrier="one2free"
+  <apn carrier="one2free"
       authtype="3"
       mcc="454"
       mnc="10"
@@ -25965,8 +23967,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="CSL Data"
+  <apn carrier="CSL Data"
       apn="hkcsl"
       mcc="454"
       mnc="10"
@@ -25980,8 +23981,7 @@
       mmsc="http://192.168.58.171:8002/"
       type="default,supl,mms"
   />
-  <apn
-      carrier="CMHK"
+  <apn carrier="CMHK"
       mcc="454"
       mnc="12"
       apn=""
@@ -25989,23 +23989,20 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMHK MMS"
+  <apn carrier="CMHK MMS"
       mcc="454"
       mnc="12"
       apn="cmhk"
       mmsc="http://mms.hk.chinamobile.com/mms"
       type="mms"
   />
-  <apn
-      carrier="CMHK Data"
+  <apn carrier="CMHK Data"
       mcc="454"
       mnc="12"
       apn="cmhk"
       type="default,supl"
   />
-  <apn
-      carrier="CMHK"
+  <apn carrier="CMHK"
       mcc="454"
       mnc="13"
       apn=""
@@ -26013,23 +24010,20 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMHK MMS"
+  <apn carrier="CMHK MMS"
       mcc="454"
       mnc="13"
       apn="cmhk"
       mmsc="http://mms.hk.chinamobile.com/mms"
       type="mms"
   />
-  <apn
-      carrier="CMHK Data"
+  <apn carrier="CMHK Data"
       mcc="454"
       mnc="13"
       apn="cmhk"
       type="default,supl"
   />
-  <apn
-      carrier="SmarTone"
+  <apn carrier="SmarTone"
       mcc="454"
       mnc="15"
       apn="SmarTone"
@@ -26039,8 +24033,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SMC-Voda"
+  <apn carrier="SMC-Voda"
       apn="SmarTone-Vodafone"
       mcc="454"
       mnc="15"
@@ -26054,8 +24047,7 @@
       mmsc="http://mms.smartone-vodafone.com/server"
       type="default,supl,mms"
   />
-  <apn
-      carrier="PCCW 2G"
+  <apn carrier="PCCW 2G"
       apn="pccwdata"
       mcc="454"
       mnc="16"
@@ -26069,8 +24061,7 @@
       mmsc=""
       type="default"
   />
-  <apn
-      carrier="PCCW-HKT"
+  <apn carrier="PCCW-HKT"
       mcc="454"
       mnc="16"
       apn="pccw"
@@ -26080,8 +24071,7 @@
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="PCCW 2G"
+   <apn carrier="PCCW 2G"
       apn="pccwdata"
       mcc="454"
       mnc="16"
@@ -26095,8 +24085,7 @@
       mmsc=""
       type="supl"
   />
-  <apn
-      carrier="PCCW 2G MMS"
+  <apn carrier="PCCW 2G MMS"
       apn="pccwmms"
       mcc="454"
       mnc="16"
@@ -26110,8 +24099,7 @@
       mmsc="http://mmsc.mms.pccwmobile.com:8002/"
       type="mms"
   />
-  <apn
-      carrier="PCCW_GPRS"
+  <apn carrier="PCCW_GPRS"
       mcc="454"
       mnc="16"
       apn="pccwdata"
@@ -26119,8 +24107,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="PCCW_MMS"
+  <apn carrier="PCCW_MMS"
       mcc="454"
       mnc="16"
       apn="pccwmms"
@@ -26129,8 +24116,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SMC-Voda"
+  <apn carrier="SMC-Voda"
       apn="SmarTone-Vodafone"
       mcc="454"
       mnc="17"
@@ -26144,8 +24130,7 @@
       mmsc="http://mms.smartone-vodafone.com/server"
       type="default, supl"
   />
-  <apn
-      carrier="SMC-Voda"
+  <apn carrier="SMC-Voda"
       apn="SmarTone-Vodafone"
       mcc="454"
       mnc="17"
@@ -26159,8 +24144,7 @@
       mmsc="http://mms.smartone-vodafone.com/server"
       type="mms"
   />
-  <apn
-      carrier="SmarTone"
+  <apn carrier="SmarTone"
       mcc="454"
       mnc="17"
       apn="SmarTone"
@@ -26170,8 +24154,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="1O1O"
+  <apn carrier="1O1O"
       mcc="454"
       mnc="18"
       apn="mobile"
@@ -26181,8 +24164,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="NWMOBILE"
+  <apn carrier="NWMOBILE"
       mcc="454"
       mnc="18"
       apn="NWMOBILE"
@@ -26192,8 +24174,7 @@
       authtype="3"
       type="default,supl,mms"
   />
-  <apn
-      carrier="CSL Data"
+  <apn carrier="CSL Data"
       mcc="454"
       mnc="18"
       apn="hkcsl"
@@ -26204,8 +24185,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="PCCW-HKT"
+  <apn carrier="PCCW-HKT"
       authtype="1"
       mcc="454"
       mnc="19"
@@ -26215,8 +24195,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="CTExcel"
+  <apn carrier="CTExcel"
       apn="CTExcel"
       mcc="454"
       mnc="31"
@@ -26227,8 +24206,7 @@
       mvno_type="iccid"
       mvno_match_data="8985231"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="454"
       mnc="31"
@@ -26239,8 +24217,7 @@
       mvno_type="iccid"
       mvno_match_data="898603,898611,8985302,8985307"
   />
-  <apn
-      carrier="CTExcel (IMS)"
+  <apn carrier="CTExcel (IMS)"
       apn="IMS"
       mcc="454"
       mnc="31"
@@ -26251,8 +24228,8 @@
       mvno_type="iccid"
       mvno_match_data="8985231,898603,898611,8985302,8985307"
   />
-  <apn
-      carrier="SmarTone Macau"
+
+  <apn carrier="SmarTone Macau"
       authtype="3"
       mcc="455"
       mnc="00"
@@ -26262,8 +24239,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SmarTone"
+  <apn carrier="SmarTone"
       apn="smartweb"
       mcc="455"
       mnc="00"
@@ -26277,15 +24253,13 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="CTM Data"
+  <apn carrier="CTM Data"
       mcc="455"
       mnc="01"
       apn="ctm-mobile"
       type="default,supl"
   />
-  <apn
-      carrier="CTM MMS"
+  <apn carrier="CTM MMS"
       mcc="455"
       mnc="01"
       apn="ctmmms"
@@ -26294,8 +24268,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CTM (Prepaid)"
+  <apn carrier="CTM (Prepaid)"
       mcc="455"
       mnc="01"
       apn="ctmprepaid"
@@ -26305,8 +24278,7 @@
       type="default,supl,mms"
   />
   <!-- ctnet for China Mainland-->
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="455"
       mnc="02"
@@ -26320,8 +24292,7 @@
       roaming_protocol="IPV4V6"
   />
   <!-- -MMS for China MainLand -->
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="455"
       mnc="02"
@@ -26340,8 +24311,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="455"
       mnc="02"
@@ -26355,8 +24325,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="455"
@@ -26365,8 +24334,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="3 Macau"
+  <apn carrier="3 Macau"
       mcc="455"
       mnc="03"
       apn="mobile.three.com.mo"
@@ -26376,8 +24344,7 @@
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3 Macau"
+  <apn carrier="3 Macau"
       mcc="455"
       mnc="03"
       apn="web-g.three.com.hk"
@@ -26385,15 +24352,13 @@
       password="1234"
       type="default,supl"
   />
-  <apn
-      carrier="CTM Data"
+  <apn carrier="CTM Data"
       mcc="455"
       mnc="04"
       apn="ctm-mobile"
       type="default,supl"
   />
-  <apn
-      carrier="CTM MMS"
+  <apn carrier="CTM MMS"
       mcc="455"
       mnc="04"
       apn="ctmmms"
@@ -26402,8 +24367,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CTM (Prepaid)"
+  <apn carrier="CTM (Prepaid)"
       mcc="455"
       mnc="04"
       apn="ctmprepaid"
@@ -26412,8 +24376,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="3 Macau"
+  <apn carrier="3 Macau"
       mcc="455"
       mnc="05"
       apn="mobile.three.com.mo"
@@ -26424,8 +24387,7 @@
       type="default,supl,mms"
   />
   <!-- ctnet for Macau-->
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="455"
@@ -26434,8 +24396,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="455"
       mnc="07"
@@ -26454,8 +24415,7 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="455"
       mnc="07"
@@ -26474,8 +24434,7 @@
       bearer="19"
       bearer_bitmask="13|14"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="455"
       mnc="07"
@@ -26492,8 +24451,7 @@
       bearer_bitmask="13|14"
   />
   <!-- ctnet for Macau-->
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="455"
       mnc="07"
@@ -26508,8 +24466,7 @@
       bearer_bitmask="6|7|8|12"
   />
   <!-- -MMS for Macau -->
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="455"
       mnc="07"
@@ -26529,8 +24486,7 @@
       roaming_protocol="IPV4V6"
       bearer_bitmask="6|7|8|12"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="455"
       mnc="07"
@@ -26545,99 +24501,88 @@
       roaming_protocol="IPV4V6"
       bearer_bitmask="6|7|8|12"
   />
-  <apn
-      carrier="Cellcard"
+
+  <apn carrier="Cellcard"
       mcc="456"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Smart"
+  <apn carrier="Smart"
       mcc="456"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="qb"
+  <apn carrier="qb"
       mcc="456"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Star-Cell"
+  <apn carrier="Star-Cell"
       mcc="456"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Smart"
+  <apn carrier="Smart"
       mcc="456"
       mnc="06"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Metfone"
+  <apn carrier="Metfone"
       mcc="456"
       mnc="08"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline"
+  <apn carrier="Beeline"
       mcc="456"
       mnc="09"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Excell"
+  <apn carrier="Excell"
       mcc="456"
       mnc="11"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Cellcard"
+  <apn carrier="Cellcard"
       mcc="456"
       mnc="18"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="LTC"
+
+  <apn carrier="LTC"
       mcc="457"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="ETL"
+  <apn carrier="ETL"
       mcc="457"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Unitel"
+  <apn carrier="Unitel"
       mcc="457"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Beeline"
+  <apn carrier="Beeline"
       mcc="457"
       mnc="08"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="China Mobile"
+
+  <apn carrier="China Mobile"
       apn=""
       mcc="460"
       mnc="00"
@@ -26645,15 +24590,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMCC DM"
+  <apn carrier="CMCC DM"
       apn=""
       mcc="460"
       mnc="00"
       type="fota"
   />
-  <apn
-      carrier="APN_NAME_CMNET"
+  <apn carrier="APN_NAME_CMNET"
       apn="cmnet"
       mcc="460"
       mnc="00"
@@ -26662,8 +24605,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMMMS"
+  <apn carrier="APN_NAME_CMMMS"
       apn="cmwap"
       mcc="460"
       mnc="00"
@@ -26676,8 +24618,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMWAP"
+  <apn carrier="APN_NAME_CMWAP"
       apn="cmwap"
       mcc="460"
       mnc="00"
@@ -26687,8 +24628,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Mobile (IMS)"
+  <apn carrier="China Mobile (IMS)"
       mcc="460"
       mnc="00"
       apn="ims"
@@ -26700,8 +24640,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="APN_NAME_CUNET"
+  <apn carrier="APN_NAME_CUNET"
       apn="3gnet"
       mcc="460"
       mnc="01"
@@ -26711,8 +24650,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CUMMS"
+  <apn carrier="APN_NAME_CUMMS"
       apn="3gwap"
       mcc="460"
       mnc="01"
@@ -26724,8 +24662,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Union (IMS)"
+  <apn carrier="China Union (IMS)"
       mcc="460"
       mnc="01"
       apn="ims"
@@ -26734,8 +24671,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="China Mobile"
+  <apn carrier="China Mobile"
       apn=""
       mcc="460"
       mnc="02"
@@ -26743,15 +24679,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMCC DM"
+  <apn carrier="CMCC DM"
       apn=""
       mcc="460"
       mnc="02"
       type="fota"
   />
-  <apn
-      carrier="APN_NAME_CMNET"
+  <apn carrier="APN_NAME_CMNET"
       apn="cmnet"
       mcc="460"
       mnc="02"
@@ -26760,8 +24694,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMMMS"
+  <apn carrier="APN_NAME_CMMMS"
       apn="cmwap"
       mcc="460"
       mnc="02"
@@ -26774,8 +24707,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMWAP"
+  <apn carrier="APN_NAME_CMWAP"
       apn="cmwap"
       mcc="460"
       mnc="02"
@@ -26785,8 +24717,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Mobile (IMS)"
+  <apn carrier="China Mobile (IMS)"
       mcc="460"
       mnc="02"
       apn="ims"
@@ -26799,8 +24730,7 @@
       max_conns_time="300"
   />
   <!--MMS for China MainLand -->
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="460"
       mnc="03"
@@ -26816,8 +24746,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="460"
       mnc="03"
@@ -26831,8 +24760,7 @@
       roaming_protocol="IPV4V6"
   />
   <!-- ctnet -->
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="03"
@@ -26845,8 +24773,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="460"
@@ -26855,8 +24782,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CTExcel"
+  <apn carrier="CTExcel"
       apn="CTExcel"
       mcc="460"
       mnc="03"
@@ -26867,8 +24793,7 @@
       mvno_type="iccid"
       mvno_match_data="8985231"
   />
-  <apn
-      carrier="China Mobile"
+  <apn carrier="China Mobile"
       apn=""
       mcc="460"
       mnc="04"
@@ -26876,15 +24801,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMCC DM"
+  <apn carrier="CMCC DM"
       apn=""
       mcc="460"
       mnc="04"
       type="fota"
   />
-  <apn
-      carrier="APN_NAME_CMNET"
+  <apn carrier="APN_NAME_CMNET"
       apn="cmnet"
       mcc="460"
       mnc="04"
@@ -26893,8 +24816,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMMMS"
+  <apn carrier="APN_NAME_CMMMS"
       apn="cmwap"
       mcc="460"
       mnc="04"
@@ -26907,8 +24829,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMWAP"
+  <apn carrier="APN_NAME_CMWAP"
       apn="cmwap"
       mcc="460"
       mnc="04"
@@ -26918,8 +24839,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Mobile (IMS)"
+  <apn carrier="China Mobile (IMS)"
       mcc="460"
       mnc="04"
       apn="ims"
@@ -26931,8 +24851,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="China Union (IMS)"
+  <apn carrier="China Union (IMS)"
       mcc="460"
       mnc="06"
       apn="ims"
@@ -26941,8 +24860,7 @@
       roaming_protocol="IPV4V6"
       user_editable="0"
   />
-  <apn
-      carrier="China Mobile"
+  <apn carrier="China Mobile"
       apn=""
       mcc="460"
       mnc="07"
@@ -26950,15 +24868,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMCC DM"
+  <apn carrier="CMCC DM"
       apn=""
       mcc="460"
       mnc="07"
       type="fota"
   />
-  <apn
-      carrier="APN_NAME_CMNET"
+  <apn carrier="APN_NAME_CMNET"
       apn="cmnet"
       mcc="460"
       mnc="07"
@@ -26967,8 +24883,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMMMS"
+  <apn carrier="APN_NAME_CMMMS"
       apn="cmwap"
       mcc="460"
       mnc="07"
@@ -26981,8 +24896,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMWAP"
+  <apn carrier="APN_NAME_CMWAP"
       apn="cmwap"
       mcc="460"
       mnc="07"
@@ -26992,8 +24906,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Mobile (IMS)"
+  <apn carrier="China Mobile (IMS)"
       mcc="460"
       mnc="07"
       apn="ims"
@@ -27005,8 +24918,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="China Mobile"
+  <apn carrier="China Mobile"
       apn=""
       mcc="460"
       mnc="08"
@@ -27014,15 +24926,13 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="CMCC DM"
+  <apn carrier="CMCC DM"
       apn=""
       mcc="460"
       mnc="08"
       type="fota"
   />
-  <apn
-      carrier="APN_NAME_CMNET"
+  <apn carrier="APN_NAME_CMNET"
       apn="cmnet"
       mcc="460"
       mnc="08"
@@ -27031,8 +24941,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMMMS"
+  <apn carrier="APN_NAME_CMMMS"
       apn="cmwap"
       mcc="460"
       mnc="08"
@@ -27045,8 +24954,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CMWAP"
+  <apn carrier="APN_NAME_CMWAP"
       apn="cmwap"
       mcc="460"
       mnc="08"
@@ -27056,8 +24964,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Mobile (IMS)"
+  <apn carrier="China Mobile (IMS)"
       mcc="460"
       mnc="08"
       apn="ims"
@@ -27069,8 +24976,7 @@
       max_conns="1023"
       max_conns_time="300"
   />
-  <apn
-      carrier="APN_NAME_CUNET"
+  <apn carrier="APN_NAME_CUNET"
       apn="3gnet"
       mcc="460"
       mnc="09"
@@ -27080,8 +24986,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="APN_NAME_CUMMS"
+  <apn carrier="APN_NAME_CUMMS"
       apn="3gwap"
       mcc="460"
       mnc="09"
@@ -27093,8 +24998,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="China Union (IMS)"
+  <apn carrier="China Union (IMS)"
       mcc="460"
       mnc="09"
       apn="ims"
@@ -27104,8 +25008,7 @@
       user_editable="0"
   />
   <!-- CT IA APN for China MainLand -->
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="11"
@@ -27117,8 +25020,7 @@
       roaming_protocol="IPV4V6"
   />
   <!-- CT IMS APN for China MainLand -->
-  <apn
-      carrier="China Telecomm (IMS)"
+  <apn carrier="China Telecomm (IMS)"
       apn="IMS"
       type="ims"
       mcc="460"
@@ -27128,8 +25030,7 @@
       roaming_protocol="IPV4V6"
   />
   <!-- CT 3GPP APN profile for China MainLand -->
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="11"
@@ -27140,8 +25041,7 @@
       bearer_bitmask="14|18|19"
       bearer="20"
   />
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="460"
       mnc="11"
@@ -27155,8 +25055,7 @@
       bearer_bitmask="14|18|19"
       bearer="20"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="460"
       mnc="11"
@@ -27168,8 +25067,7 @@
       bearer="20"
   />
   <!--Use CT 3GPP APN profile on eHRPD for China MainLand-->
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="11"
@@ -27179,8 +25077,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="460"
       mnc="11"
@@ -27193,8 +25090,7 @@
       roaming_protocol="IPV4V6"
       bearer="13"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="460"
       mnc="11"
@@ -27205,8 +25101,7 @@
       bearer="13"
   />
   <!--CT 3GPP2 APN profile for China MainLand-->
-  <apn
-      carrier="APN_NAME_CTMMS"
+  <apn carrier="APN_NAME_CTMMS"
       apn="ctwap"
       mcc="460"
       mnc="11"
@@ -27223,8 +25118,7 @@
       roaming_protocol="IPV4V6"
       bearer_bitmask="6|7|8|12"
   />
-  <apn
-      carrier="APN_NAME_CTWAP"
+  <apn carrier="APN_NAME_CTWAP"
       apn="ctwap"
       mcc="460"
       mnc="11"
@@ -27238,8 +25132,7 @@
       roaming_protocol="IPV4V6"
       bearer_bitmask="6|7|8|12"
   />
-  <apn
-      carrier="APN_NAME_CTNET"
+  <apn carrier="APN_NAME_CTNET"
       apn="ctnet"
       mcc="460"
       mnc="11"
@@ -27253,8 +25146,8 @@
       roaming_protocol="IPV4V6"
       bearer_bitmask="6|7|8|12"
   />
-  <apn
-      carrier="遠傳電信(Far EasTone) (MMS)"
+
+  <apn carrier="遠傳電信(Far EasTone) (MMS)"
       mcc="466"
       mnc="01"
       apn="fetnet01"
@@ -27263,45 +25156,39 @@
       mmsport="9201"
       type="mms"
   />
-  <apn
-      carrier="遠傳電信(Far EasTone) (Internet)"
+  <apn carrier="遠傳電信(Far EasTone) (Internet)"
       mcc="466"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="466"
       mnc="01"
       apn="ims"
       type="ims"
       protocol="IP"
   />
-  <apn
-      carrier="APT (Internet)"
+  <apn carrier="APT (Internet)"
       mcc="466"
       mnc="05"
       apn="internet"
       type="default"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="466"
       mnc="05"
       apn="ims"
       type="ims"
       protocol="IPV4V6"
   />
-  <apn
-      carrier="和信電訊(KGT-Online) (Internet)"
+  <apn carrier="和信電訊(KGT-Online) (Internet)"
       mcc="466"
       mnc="88"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="和信電訊(KGT-Online) (MMS)"
+  <apn carrier="和信電訊(KGT-Online) (MMS)"
       mcc="466"
       mnc="88"
       apn="kgtmms"
@@ -27310,8 +25197,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AURORA (MMS)"
+  <apn carrier="AURORA (MMS)"
       apn="aurorawap"
       mcc="466"
       mnc="89"
@@ -27325,8 +25211,7 @@
       mmsc="http://auroramms"
       type="mms"
   />
-  <apn
-      carrier="AURORA (Internet)"
+   <apn carrier="AURORA (Internet)"
       apn="auroraweb"
       mcc="466"
       mnc="89"
@@ -27340,29 +25225,25 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="VIBO-vibo"
+  <apn carrier="VIBO-vibo"
       mcc="466"
       mnc="89"
       apn="vibo"
       type="default,supl"
   />
-  <apn
-      carrier="T Star-internet"
+  <apn carrier="T Star-internet"
       mcc="466"
       mnc="89"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="VIBOONE"
+  <apn carrier="VIBOONE"
       mcc="466"
       mnc="89"
       apn="viboone"
       type="default,supl"
   />
-  <apn
-      carrier="T Star-MMS"
+  <apn carrier="T Star-MMS"
       mcc="466"
       mnc="89"
       apn="internet"
@@ -27371,23 +25252,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="T Star-IMS"
+  <apn carrier="T Star-IMS"
       mcc="466"
       mnc="89"
       apn="ims"
       type="ims"
       protocol="IP"
   />
-  <apn
-      carrier="中華電信(Chunghwa) (Internet)"
+  <apn carrier="中華電信(Chunghwa) (Internet)"
       mcc="466"
       mnc="92"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="中華電信(Chunghwa)"
+  <apn carrier="中華電信(Chunghwa)"
       mcc="466"
       mnc="92"
       apn="emome"
@@ -27396,8 +25274,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="中華電信(Chunghwa) (MMS)"
+   <apn carrier="中華電信(Chunghwa) (MMS)"
       apn="emome"
       mcc="466"
       mnc="92"
@@ -27406,8 +25283,7 @@
       mmsc="http://mms.emome.net:8002"
       type="mms"
   />
-  <apn
-      carrier="CHT"
+   <apn carrier="CHT"
       apn="internet"
       mcc="466"
       mnc="92"
@@ -27421,16 +25297,14 @@
       mmsc=""
       type="default,supl"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="466"
       mnc="92"
       apn="ims"
       type="ims"
       protocol="IP"
   />
-  <apn
-      carrier="Mobitai MMS"
+  <apn carrier="Mobitai MMS"
       apn="gprs1"
       mcc="466"
       mnc="93"
@@ -27444,22 +25318,19 @@
       mmsc="http://mms.mobeelife.net/mms/wapenc"
       type="mms"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (Internet)"
+  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
       mcc="466"
       mnc="93"
       apn="Internet"
       type="default,supl"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (twm)"
+  <apn carrier="台灣大哥大(TW Mobile) (twm)"
       mcc="466"
       mnc="93"
       apn="TWM"
       type="default,supl"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (MMS)"
+  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
       mcc="466"
       mnc="93"
       apn="MMS"
@@ -27468,22 +25339,19 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (Internet)"
+  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
       mcc="466"
       mnc="97"
       apn="Internet"
       type="default,supl"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (twm)"
+  <apn carrier="台灣大哥大(TW Mobile) (twm)"
       mcc="466"
       mnc="97"
       apn="TWM"
       type="default,supl"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (MMS)"
+  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
       mcc="466"
       mnc="97"
       apn="MMS"
@@ -27492,30 +25360,26 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="466"
       mnc="97"
       apn="ims"
       type="ims"
       protocol="IP"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (Internet)"
+  <apn carrier="台灣大哥大(TW Mobile) (Internet)"
       mcc="466"
       mnc="99"
       apn="Internet"
       type="default,supl"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (twm)"
+  <apn carrier="台灣大哥大(TW Mobile) (twm)"
       mcc="466"
       mnc="99"
       apn="TWM"
       type="default,supl"
   />
-  <apn
-      carrier="台灣大哥大(TW Mobile) (MMS)"
+  <apn carrier="台灣大哥大(TW Mobile) (MMS)"
       mcc="466"
       mnc="99"
       apn="mms"
@@ -27524,16 +25388,14 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="GP-INTERNET"
+  <apn carrier="GP-INTERNET"
       mcc="470"
       mnc="01"
       apn="gpinternet"
       authtype="0"
       type="default,supl,agps,fota,dun"
   />
-  <apn
-      carrier="GP-MMS"
+  <apn carrier="GP-MMS"
       mcc="470"
       mnc="01"
       apn="gpmms"
@@ -27543,29 +25405,26 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Dhiraagu"
+  <apn carrier="Dhiraagu"
       mcc="472"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Wataniya"
+  <apn carrier="Wataniya"
       mcc="472"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="DiGi Internet"
+
+  <apn carrier="DiGi Internet"
       mcc="502"
       mnc="10"
       apn="diginet"
       type="default,supl"
   />
-  <apn
-      carrier="DiGi MMS"
+  <apn carrier="DiGi MMS"
       mcc="502"
       mnc="10"
       apn="digimms"
@@ -27577,12 +25436,10 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Maxis Internet"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="12"
-      apn="max4g"
-      authtype="1"
+      apn="max4g" authtype="1"
       user="maxis"
       password="wap"
       mmsc="http://172.16.74.100:10021/mmsc"
@@ -27590,8 +25447,7 @@
       mmsport="80"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Maxis 3G Internet"
+  <apn carrier="Maxis 3G Internet"
       mcc="502"
       mnc="12"
       apn="unet"
@@ -27599,8 +25455,7 @@
       password="wap"
       type="default,supl"
   />
-  <apn
-      carrier="Celcom Internet"
+   <apn carrier="Celcom Internet"
       mcc="502"
       mnc="13"
       apn="celcom4g"
@@ -27609,8 +25464,7 @@
       mmsc="http://mms.celcom.net.my"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Maxis Internet"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="142"
       apn="max4g"
@@ -27622,15 +25476,13 @@
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="DiGi Internet"
+  <apn carrier="DiGi Internet"
       mcc="502"
       mnc="143"
       apn="diginet"
       type="default,supl"
   />
-  <apn
-      carrier="DiGi MMS"
+  <apn carrier="DiGi MMS"
       mcc="502"
       mnc="143"
       apn="digimms"
@@ -27642,8 +25494,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Celcom Internet"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="145"
       apn="celcom4g"
@@ -27652,15 +25503,13 @@
       mmsc="http://mms.celcom.net.my"
       type="default,supl,mms"
   />
-  <apn
-      carrier="DiGi Internet"
+  <apn carrier="DiGi Internet"
       mcc="502"
       mnc="146"
       apn="diginet"
       type="default,supl"
   />
-  <apn
-      carrier="DiGi MMS"
+  <apn carrier="DiGi MMS"
       mcc="502"
       mnc="146"
       apn="digimms"
@@ -27672,8 +25521,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Maxis Internet"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="147"
       apn="max4g"
@@ -27685,8 +25533,7 @@
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Celcom Internet"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="148"
       apn="celcom4g"
@@ -27695,12 +25542,10 @@
       mmsc="http://mms.celcom.net.my"
       type="default,supl,mms"
   />
-  <apn
-      carrier="DiGi MMS"
+  <apn carrier="DiGi MMS"
       mcc="502"
       mnc="16"
-      apn="digimms"
-      authtype="1"
+      apn="digimms" authtype="1"
       user="mms"
       password="mms"
       mmsc="http://mms.digi.com.my/servlets/mms"
@@ -27708,15 +25553,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="DiGi Internet"
+  <apn carrier="DiGi Internet"
       mcc="502"
       mnc="16"
       apn="diginet"
       type="default,supl"
   />
-  <apn
-      carrier="U Mobile MMS"
+  <apn carrier="U Mobile MMS"
       mcc="502"
       mnc="18"
       apn="my3g"
@@ -27725,22 +25568,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="U Mobile Internet"
+  <apn carrier="U Mobile Internet"
       mcc="502"
       mnc="18"
       apn="my3g"
       type="default,supl"
   />
-  <apn
-      carrier="Celcom Internet"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="19"
       apn="celcom.net.my"
       type="default,supl"
   />
-  <apn
-      carrier="Celcom 3G MMS"
+  <apn carrier="Celcom 3G MMS"
       mcc="502"
       mnc="19"
       apn="celcom3g"
@@ -27749,15 +25589,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Celcom 3G Internet"
+  <apn carrier="Celcom 3G Internet"
       mcc="502"
       mnc="19"
       apn="celcom3g"
       type="default,supl"
   />
-  <apn
-      carrier="Maxis Internet"
+  <apn carrier="Maxis Internet"
       mcc="502"
       mnc="17"
       apn="max4g"
@@ -27769,8 +25607,7 @@
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="U Mobile Internet"
+  <apn carrier="U Mobile Internet"
       mcc="502"
       mnc="18"
       apn="my3g"
@@ -27779,8 +25616,7 @@
       mmsc="http://10.30.3.11/servlets/mms"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Celcom Internet"
+  <apn carrier="Celcom Internet"
       mcc="502"
       mnc="19"
       apn="celcom4g"
@@ -27789,15 +25625,14 @@
       mmsc="http://mms.celcom.net.my"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Telstra Internet"
+
+  <apn carrier="Telstra Internet"
       mcc="505"
       mnc="01"
       apn="telstra.wap"
       type="default,supl"
   />
-  <apn
-      carrier="Telstra MMS"
+  <apn carrier="Telstra MMS"
       mcc="505"
       mnc="01"
       apn="telstra.mms"
@@ -27806,29 +25641,25 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Optus Yes Internet"
+  <apn carrier="Optus Yes Internet"
       mcc="505"
       mnc="02"
       apn="yesinternet"
       type="default,supl"
   />
-  <apn
-      carrier="Optus Business Mobile Broadband"
+  <apn carrier="Optus Business Mobile Broadband"
       mcc="505"
       mnc="02"
       apn="yesbusiness"
       type="default,supl"
   />
-  <apn
-      carrier="Optus Internet"
+  <apn carrier="Optus Internet"
       mcc="505"
       mnc="02"
       apn="internet"
       type="default"
   />
-  <apn
-      carrier="Optus MMS"
+  <apn carrier="Optus MMS"
       mcc="505"
       mnc="02"
       apn="mms"
@@ -27837,8 +25668,7 @@
       mmsport="8070"
       type="mms"
   />
-  <apn
-      carrier="Truphone"
+  <apn carrier="Truphone"
       mcc="505"
       mnc="02"
       apn="truphone.com"
@@ -27846,8 +25676,7 @@
       mvno_match_data="50502100"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Virgin Internet"
+  <apn carrier="Virgin Internet"
       mcc="505"
       mnc="02"
       apn="virgininternet"
@@ -27857,8 +25686,7 @@
       mvno_match_data="505029"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Virgin MMS"
+  <apn carrier="Virgin MMS"
       mcc="505"
       mnc="02"
       apn="virginmms"
@@ -27869,8 +25697,7 @@
       mvno_match_data="505029"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Vodafone live!"
+  <apn carrier="Vodafone live!"
       mcc="505"
       mnc="03"
       apn="live.vodafone.com"
@@ -27879,19 +25706,16 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Planet 3"
+  <apn carrier="Planet 3"
       mcc="505"
       mnc="06"
-      apn="3services"
-      authtype="0"
+      apn="3services" authtype="0"
       mmsc="http://mmsc.three.net.au:10021/mmsc"
       mmsproxy="10.176.57.25"
       mmsport="8799"
       protocol="IP"
   />
-  <apn
-      carrier="VF AU PXT"
+  <apn carrier="VF AU PXT"
       mcc="505"
       mnc="07"
       apn="live.vodafone.com"
@@ -27900,15 +25724,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="VF Internet"
+  <apn carrier="VF Internet"
       mcc="505"
       mnc="07"
       apn="vfinternet.au"
       type="default,supl"
   />
-  <apn
-      carrier="Telstra MMS"
+  <apn carrier="Telstra MMS"
       mcc="505"
       mnc="11"
       apn="Telstra.mms"
@@ -27917,22 +25739,19 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Telstra Internet"
+  <apn carrier="Telstra Internet"
       mcc="505"
       mnc="11"
       apn="Telstra.wap"
       type="default,supl"
   />
-  <apn
-      carrier="3Internet"
+  <apn carrier="3Internet"
       mcc="505"
       mnc="12"
       apn="3netaccess"
       type="default,supl"
   />
-  <apn
-      carrier="3"
+  <apn carrier="3"
       mcc="505"
       mnc="12"
       apn="3services"
@@ -27941,8 +25760,7 @@
       mmsport="8799"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Telstra MMS"
+  <apn carrier="Telstra MMS"
       mcc="505"
       mnc="71"
       apn="Telstra.mms"
@@ -27951,15 +25769,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Telstra Internet"
+  <apn carrier="Telstra Internet"
       mcc="505"
       mnc="71"
       apn="Telstra.wap"
       type="default,supl"
   />
-  <apn
-      carrier="Telstra MMS"
+  <apn carrier="Telstra MMS"
       mcc="505"
       mnc="72"
       apn="Telstra.mms"
@@ -27968,15 +25784,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Telstra Internet"
+  <apn carrier="Telstra Internet"
       mcc="505"
       mnc="72"
       apn="Telstra.wap"
       type="default,supl"
   />
-  <apn
-      carrier="VF AU PXT"
+  <apn carrier="VF AU PXT"
       mcc="505"
       mnc="88"
       apn="live.vodafone.com"
@@ -27985,22 +25799,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="VF Internet"
+  <apn carrier="VF Internet"
       mcc="505"
       mnc="88"
       apn="vfinternet.au"
       type="default,supl"
   />
-  <apn
-      carrier="Optus Internet"
+  <apn carrier="Optus Internet"
       mcc="505"
       mnc="90"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Optus MMS"
+  <apn carrier="Optus MMS"
       mcc="505"
       mnc="90"
       apn="mms"
@@ -28009,8 +25820,7 @@
       mmsport="8070"
       type="mms"
   />
-  <apn
-      carrier="Vodafone Live!"
+  <apn carrier="Vodafone Live!"
       mcc="505"
       mnc="99"
       apn="live.vodafone.com"
@@ -28018,16 +25828,15 @@
       mmsproxy="10.202.2.60"
       mmsport="8080"
   />
-  <apn
-      carrier="Indosat-SNS"
+
+  <apn carrier="Indosat-SNS"
       mcc="510"
       mnc="01"
       apn="indosatgprs"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="ISAT BB INTERNET"
+  <apn carrier="ISAT BB INTERNET"
       mcc="510"
       mnc="01"
       apn="indosat3g"
@@ -28037,8 +25846,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Indosat GPRS"
+ <apn carrier="Indosat GPRS"
       mcc="510"
       mnc="01"
       apn="indosatgprs"
@@ -28049,8 +25857,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Indosat MMS"
+  <apn carrier="Indosat MMS"
       mcc="510"
       mnc="01"
       apn="indosatmms"
@@ -28062,16 +25869,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AXIS-SNS"
+  <apn carrier="AXIS-SNS"
       mcc="510"
       mnc="08"
       apn="AXIS"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="AXISwap"
+  <apn carrier="AXISwap"
       mcc="510"
       mnc="08"
       apn="AXIS"
@@ -28082,12 +25887,10 @@
       type="default,supl"
       authtype="1"
   />
-  <apn
-      carrier="AXISmms"
+  <apn carrier="AXISmms"
       mcc="510"
       mnc="08"
-      apn="AXISmms"
-      authtype="1"
+      apn="AXISmms" authtype="1"
       user="axis"
       password="123456"
       mmsc="http://mmsc.axis"
@@ -28095,15 +25898,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="TSEL-SNS"
+  <apn carrier="TSEL-SNS"
       mcc="510"
       mnc="10"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="TSEL-WAP"
+  <apn carrier="TSEL-WAP"
       mcc="510"
       mnc="10"
       apn="telkomsel"
@@ -28114,8 +25915,7 @@
       port="8000"
       type="default,supl"
   />
-  <apn
-      carrier="TSEL-MMS"
+  <apn carrier="TSEL-MMS"
       authtype="1"
       mcc="510"
       mnc="10"
@@ -28127,16 +25927,14 @@
       mmsport="8000"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="510"
       mnc="11"
       apn="internet"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="XL GPRS"
+  <apn carrier="XL GPRS"
       mcc="510"
       mnc="11"
       apn="www.xlgprs.net"
@@ -28144,8 +25942,7 @@
       password="proxl"
       type="default,supl"
   />
-  <apn
-      carrier="XL-MMS"
+  <apn carrier="XL-MMS"
       authtype="1"
       mcc="510"
       mnc="11"
@@ -28157,15 +25954,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="XL Unlimited"
+  <apn carrier="XL Unlimited"
       mcc="510"
       mnc="11"
       apn="xlunlimited"
       type="default,supl"
   />
-  <apn
-      carrier="XL MMS"
+ <apn carrier="XL MMS"
       mcc="510"
       mnc="11"
       type="mms"
@@ -28176,16 +25971,14 @@
       password="proxl"
       user="xlgprs"
   />
-  <apn
-      carrier="Indosat-SNS"
+  <apn carrier="Indosat-SNS"
       mcc="510"
       mnc="21"
       apn="indosatgprs"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Indosat MMS"
+  <apn carrier="Indosat MMS"
       mcc="510"
       mnc="21"
       apn="indosatmms"
@@ -28197,17 +25990,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="3-SNS"
+  <apn carrier="3-SNS"
       mcc="510"
       mnc="89"
       apn="3gprs"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="3MMS"
-      authtype="1"
+  <apn carrier="3MMS" authtype="1"
       mcc="510"
       mnc="89"
       apn="3mms"
@@ -28218,43 +26008,39 @@
       mmsport="3128"
       type="mms"
   />
-  <apn
-      carrier="Telin"
+
+  <apn carrier="Telin"
       mcc="514"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Timor Telecom"
+  <apn carrier="Timor Telecom"
       mcc="514"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Viettel Timor-Leste"
+  <apn carrier="Viettel Timor-Leste"
       mcc="514"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Globe Internet"
+
+  <apn carrier="Globe Internet"
       mcc="515"
       mnc="02"
       apn="internet.globe.com.ph"
       type="default"
   />
-  <apn
-      carrier="MyGlobe Internet"
+  <apn carrier="MyGlobe Internet"
       mcc="515"
       mnc="02"
       apn="http.globe.com.ph"
       type="default"
   />
-  <apn
-      carrier="myGlobe Connect"
+  <apn carrier="myGlobe Connect"
       mcc="515"
       mnc="02"
       apn="www.globe.com.ph"
@@ -28262,8 +26048,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MyGLobe MMS"
+  <apn carrier="MyGLobe MMS"
       mcc="515"
       mnc="02"
       apn="mms.globe.com.ph"
@@ -28272,29 +26057,25 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cherry Mobile Internet"
+  <apn carrier="Cherry Mobile Internet"
       mcc="515"
       mnc="02"
       apn="internet.cherry.com.ph"
       type="default"
   />
-  <apn
-      carrier="SMARTLTE"
+  <apn carrier="SMARTLTE"
       mcc="515"
       mnc="03"
       apn="smartlte"
       type="default,supl"
   />
-  <apn
-      carrier="SMART INTERNET"
+  <apn carrier="SMART INTERNET"
       mcc="515"
       mnc="03"
       apn="internet"
       type="default"
   />
-  <apn
-      carrier="Smart GPRS"
+  <apn carrier="Smart GPRS"
       mcc="515"
       mnc="03"
       apn="Smart1"
@@ -28302,8 +26083,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="SMART MMS"
+  <apn carrier="SMART MMS"
       mcc="515"
       mnc="03"
       apn="mms"
@@ -28312,15 +26092,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SUN Internet"
+  <apn carrier="SUN Internet"
       mcc="515"
       mnc="05"
       apn="minternet"
       type="default"
   />
-  <apn
-      carrier="SUN WAP GPRS"
+  <apn carrier="SUN WAP GPRS"
       mcc="515"
       mnc="05"
       apn="wap"
@@ -28328,15 +26106,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Sun SBW"
+  <apn carrier="Sun SBW"
       mcc="515"
       mnc="05"
       apn="fbband"
       type="default,supl"
   />
-  <apn
-      carrier="SUN MMS"
+  <apn carrier="SUN MMS"
       mcc="515"
       mnc="05"
       apn="mms"
@@ -28345,15 +26121,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Redinternet"
+  <apn carrier="Redinternet"
       mcc="515"
       mnc="18"
       apn="redinternet"
       type="default,supl"
   />
-  <apn
-      carrier="Redmms"
+  <apn carrier="Redmms"
       mcc="515"
       mnc="18"
       apn="real.globe.com.ph"
@@ -28362,15 +26136,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="CAT3G INTERNET"
+
+  <apn carrier="CAT3G INTERNET"
       mcc="520"
       mnc="00"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="CAT3G MMS"
+  <apn carrier="CAT3G MMS"
       mcc="520"
       mnc="00"
       apn="catmms"
@@ -28379,8 +26152,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="True Internet"
+  <apn carrier="True Internet"
       mcc="520"
       mnc="00"
       apn="internet"
@@ -28388,8 +26160,7 @@
       password="TRUE"
       type="default"
   />
-  <apn
-      carrier="True H+ Internet"
+  <apn carrier="True H+ Internet"
       mcc="520"
       mnc="00"
       apn="hinternet"
@@ -28397,8 +26168,7 @@
       password="TRUE"
       type="default"
   />
-  <apn
-      carrier="True H+ MMS"
+  <apn carrier="True H+ MMS"
       mcc="520"
       mnc="00"
       apn="hmms"
@@ -28409,8 +26179,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="True H+ Internet"
+  <apn carrier="True H+ Internet"
       mcc="520"
       mnc="00"
       apn="hinternet"
@@ -28418,8 +26187,7 @@
       password="TRUE"
       type="default"
   />
-  <apn
-      carrier="TRUE-H INTERNET"
+  <apn carrier="TRUE-H INTERNET"
       mcc="520"
       mnc="00"
       apn="internet"
@@ -28430,8 +26198,7 @@
       mvno_match_data="01"
       mvno_type="gid"
   />
-  <apn
-      carrier="TRUE-H MMS"
+  <apn carrier="TRUE-H MMS"
       mcc="520"
       mnc="00"
       apn="hmms"
@@ -28445,16 +26212,13 @@
       mvno_match_data="01"
       mvno_type="gid"
   />
-  <apn
-      carrier="AIS Internet"
+  <apn carrier="AIS Internet"
       mcc="520"
       mnc="01"
-      apn="internet"
-      authtype="0"
+      apn="internet" authtype="0"
       type="default,supl"
   />
-  <apn
-      carrier="AIS MMS"
+  <apn carrier="AIS MMS"
       mcc="520"
       mnc="01"
       apn="multimedia"
@@ -28463,16 +26227,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="AIS Internet"
+  <apn carrier="AIS Internet"
       mcc="520"
       mnc="03"
       apn="internet"
       authtype="2"
       type="default"
   />
-  <apn
-      carrier="AIS MMS"
+  <apn carrier="AIS MMS"
       mcc="520"
       mnc="03"
       apn="internet"
@@ -28482,8 +26244,7 @@
       mmsport="8080"
       type="default"
   />
-  <apn
-      carrier="AIS MMS"
+  <apn carrier="AIS MMS"
       mcc="520"
       mnc="03"
       apn="multimedia"
@@ -28492,8 +26253,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="TRUE-H INTERNET"
+  <apn carrier="TRUE-H INTERNET"
       mcc="520"
       mnc="04"
       apn="internet"
@@ -28502,8 +26262,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="TRUE-H MMS"
+  <apn carrier="TRUE-H MMS"
       mcc="520"
       mnc="04"
       apn="hmms"
@@ -28515,15 +26274,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="DTAC Internet"
+  <apn carrier="DTAC Internet"
       mcc="520"
       mnc="05"
       apn="www.dtac.co.th"
       type="default"
   />
-  <apn
-      carrier="DTAC MMS"
+  <apn carrier="DTAC MMS"
       mcc="520"
       mnc="05"
       apn="mms"
@@ -28532,15 +26289,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="TOT3G Internet"
+  <apn carrier="TOT3G Internet"
       mcc="520"
       mnc="15"
       apn="internet"
       type="default"
   />
-  <apn
-      carrier="TOT 3G MMS"
+  <apn carrier="TOT 3G MMS"
       mcc="520"
       mnc="15"
       apn="mms"
@@ -28549,8 +26304,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="dtac MMS"
+  <apn carrier="dtac MMS"
       mcc="520"
       mnc="18"
       apn="mms"
@@ -28559,16 +26313,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="dtac Internet"
+  <apn carrier="dtac Internet"
       mcc="520"
       mnc="18"
       apn="www.dtac.co.th"
       type="default,supl"
   />
-  <apn
-      carrier="TRUE INTERNET"
-      authtype="1"
+  <apn carrier="TRUE INTERNET" authtype="1"
       mcc="520"
       mnc="99"
       apn="internet"
@@ -28576,8 +26327,7 @@
       password="true"
       type="default,supl"
   />
-  <apn
-      carrier="TRUE MMS"
+  <apn carrier="TRUE MMS"
       mcc="520"
       mnc="99"
       apn="hmms"
@@ -28589,8 +26339,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="True GPRS MMS"
+  <apn carrier="True GPRS MMS"
       mcc="520"
       mnc="99"
       apn="mms"
@@ -28601,8 +26350,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SingTel (PostPaid)"
+
+  <apn carrier="SingTel (PostPaid)"
       mcc="525"
       mnc="01"
       apn="e-ideas"
@@ -28611,8 +26360,7 @@
       mmsc="http://mms.singtel.com:10021/mmsc"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SingTel (PrePaid)"
+  <apn carrier="SingTel (PrePaid)"
       mcc="525"
       mnc="01"
       apn="hicard"
@@ -28621,8 +26369,7 @@
       mmsc="http://mms.singtel.com:10021/mmsc"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SingTel (PostPaid)"
+  <apn carrier="SingTel (PostPaid)"
       mcc="525"
       mnc="02"
       apn="e-ideas"
@@ -28631,8 +26378,7 @@
       mmsport="8080"
       type="default,supl,mms"
   />
-  <apn
-      carrier="SingTel (PrePaid)"
+  <apn carrier="SingTel (PrePaid)"
       mcc="525"
       mnc="02"
       apn="hicard"
@@ -28641,15 +26387,13 @@
       mmsc="http://mms.singtel.com:10021/mmsc"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Sunsurf Mobile"
+  <apn carrier="Sunsurf Mobile"
       mcc="525"
       mnc="03"
       apn="sunsurf"
       type="default,supl"
   />
-  <apn
-      carrier="M1 WAP"
+  <apn carrier="M1 WAP"
       mcc="525"
       mnc="03"
       apn="miworld"
@@ -28660,9 +26404,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="M1 MMS(3G)"
-      authtype="1"
+  <apn carrier="M1 MMS(3G)" authtype="1"
       mcc="525"
       mnc="03"
       apn="miworld"
@@ -28673,23 +26415,20 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Sunsurf Mobile"
+  <apn carrier="Sunsurf Mobile"
       mcc="525"
       mnc="03"
       apn="sunsurf"
       user="65"
       type="default,supl"
   />
-  <apn
-      carrier="Sunsurf Mobile"
+  <apn carrier="Sunsurf Mobile"
       mcc="525"
       mnc="04"
       apn="sunsurf"
       type="default,supl"
   />
-  <apn
-      carrier="M1 WAP"
+  <apn carrier="M1 WAP"
       mcc="525"
       mnc="04"
       apn="miworld"
@@ -28700,8 +26439,7 @@
       port="8081"
       type="default,supl"
   />
-  <apn
-      carrier="M1 MMS(3G)"
+  <apn carrier="M1 MMS(3G)"
       mcc="525"
       mnc="04"
       apn="miworld"
@@ -28713,22 +26451,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="SH Data Postpaid"
+  <apn carrier="SH Data Postpaid"
       mcc="525"
       mnc="05"
       apn="shwap"
       type="default,supl"
   />
-  <apn
-      carrier="StarHub"
+  <apn carrier="StarHub"
       mcc="525"
       mnc="05"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="SH MMS Postpaid"
+  <apn carrier="SH MMS Postpaid"
       mcc="525"
       mnc="05"
       apn="shmms"
@@ -28737,8 +26472,7 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Gee!"
+  <apn carrier="Gee!"
       mcc="525"
       mnc="05"
       apn="shwap"
@@ -28748,29 +26482,27 @@
       port="80"
       type="default,supl"
   />
-  <apn
-      carrier="StarHub E-mail"
+  <apn carrier="StarHub E-mail"
       mcc="525"
       mnc="05"
       apn="shwap"
       type="default,supl"
   />
-  <apn
-      carrier="B-Mobile"
+
+  <apn carrier="B-Mobile"
       mcc="528"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="DSTCom"
+  <apn carrier="DSTCom"
       mcc="528"
       mnc="11"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="VFNZ Gateway"
+
+  <apn carrier="VFNZ Gateway"
       mcc="530"
       mnc="01"
       apn="live.vodafone.com"
@@ -28779,22 +26511,19 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="VFNZ Internet"
+  <apn carrier="VFNZ Internet"
       mcc="530"
       mnc="01"
       apn="vodafone"
       type="default,supl,dun"
   />
-  <apn
-      carrier="TelecomData"
+  <apn carrier="TelecomData"
       mcc="530"
       mnc="05"
       apn="wap.telecom.co.nz"
       type="default,supl"
   />
-  <apn
-      carrier="TelecomContent"
+  <apn carrier="TelecomContent"
       mcc="530"
       mnc="05"
       proxy="210.55.11.73"
@@ -28802,8 +26531,7 @@
       apn="wap.telecom.co.nz"
       type="default,supl"
   />
-  <apn
-      carrier="TelecomMMS"
+  <apn carrier="TelecomMMS"
       mcc="530"
       mnc="05"
       apn="wap.telecom.co.nz"
@@ -28812,15 +26540,13 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="2Degrees Internet"
+  <apn carrier="2Degrees Internet"
       mcc="530"
       mnc="24"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="2Degrees MMS"
+  <apn carrier="2Degrees MMS"
       mcc="530"
       mnc="24"
       apn="mms"
@@ -28829,22 +26555,21 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Digicel"
+
+  <apn carrier="Digicel"
       mcc="536"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="BeMobile"
+
+  <apn carrier="BeMobile"
       mcc="537"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="PNG WAP"
+  <apn carrier="PNG WAP"
       mcc="537"
       mnc="03"
       apn="wap.digicelpng.com"
@@ -28852,15 +26577,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="PNG WEB"
+  <apn carrier="PNG WEB"
       mcc="537"
       mnc="03"
       apn="internet.digicelpng.com"
       type="default,supl"
   />
-  <apn
-      carrier="Papua New Guinea:Digicel:Modem"
+  <apn carrier="Papua New Guinea:Digicel:Modem"
       mcc="537"
       mnc="03"
       apn="wap.digicel.com.pg"
@@ -28870,8 +26593,7 @@
       proxy="10.149.122.12"
       port="8080"
   />
-  <apn
-      carrier="PNG MMS"
+  <apn carrier="PNG MMS"
       mcc="537"
       mnc="03"
       apn="wap.digicelpng.com"
@@ -28880,29 +26602,26 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="U-Call"
+
+  <apn carrier="U-Call"
       mcc="539"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Shoreline Communication"
+  <apn carrier="Shoreline Communication"
       mcc="539"
       mnc="43"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Digicel"
+  <apn carrier="Digicel"
       mcc="539"
       mnc="88"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tonga:Digicel:Modem"
+  <apn carrier="Tonga:Digicel:Modem"
       mcc="539"
       mnc="88"
       apn="wap"
@@ -28912,8 +26631,7 @@
       proxy="172.16.7.12"
       port="8080"
   />
-  <apn
-      carrier="Tonga:Digicel:Mms"
+  <apn carrier="Tonga:Digicel:Mms"
       mcc="539"
       mnc="88"
       apn="wap"
@@ -28923,43 +26641,39 @@
       mmsc="http://mms.digicelgroup.com"
       mmsport="9201"
   />
-  <apn
-      carrier="BREEZE"
+
+  <apn carrier="BREEZE"
       mcc="540"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="BeMobile"
+  <apn carrier="BeMobile"
       mcc="540"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="AIL"
+
+  <apn carrier="AIL"
       mcc="541"
       mnc="00"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="SMILE"
+  <apn carrier="SMILE"
       mcc="541"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Digicel"
+  <apn carrier="Digicel"
       mcc="541"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Vanatu:Digicel:Modem"
+  <apn carrier="Vanatu:Digicel:Modem"
       mcc="541"
       mnc="05"
       apn="wap"
@@ -28969,8 +26683,7 @@
       proxy="172.16.7.12"
       port="8080"
   />
-  <apn
-      carrier="Vanatu:Digicel:Mms"
+  <apn carrier="Vanatu:Digicel:Mms"
       mcc="541"
       mnc="05"
       apn="wap"
@@ -28980,22 +26693,20 @@
       mmsc="http://mms.digicelgroup.com"
       mmsport="9201"
   />
-  <apn
-      carrier="Vodafone"
+
+  <apn carrier="Vodafone"
       mcc="542"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Digicel"
+  <apn carrier="Digicel"
       mcc="542"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Fiji:Digicel:Modem"
+  <apn carrier="Fiji:Digicel:Modem"
       mcc="542"
       mnc="02"
       apn="wap"
@@ -29005,8 +26716,8 @@
       proxy="172.16.7.12"
       port="8080"
   />
-  <apn
-      carrier="Fiji:Digicel:Mms"
+
+  <apn carrier="Fiji:Digicel:Mms"
       mcc="542"
       mnc="02"
       apn="wap"
@@ -29016,99 +26727,95 @@
       mmsc="http://mms.digicelgroup.com"
       mmsport="9201"
   />
-  <apn
-      carrier="Bluesky"
+
+  <apn carrier="Bluesky"
       mcc="544"
       mnc="11"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Kiribati - TSKL"
+
+  <apn carrier="Kiribati - TSKL"
       mcc="545"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Kiribati - Frigate Net"
+  <apn carrier="Kiribati - Frigate Net"
       mcc="545"
       mnc="09"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Mobilis"
+
+  <apn carrier="Mobilis"
       mcc="546"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Vini"
+
+  <apn carrier="Vini"
       mcc="547"
       mnc="20"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Telecom Cook"
+
+  <apn carrier="Telecom Cook"
       mcc="548"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Digicel"
+
+  <apn carrier="Digicel"
       mcc="549"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Bluesky"
+  <apn carrier="Bluesky"
       mcc="549"
       mnc="27"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="FSMTC"
+
+  <apn carrier="FSMTC"
       mcc="550"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MINTA"
+
+  <apn carrier="MINTA"
       mcc="551"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="PNCC"
+
+  <apn carrier="PNCC"
       mcc="552"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Palau Mobile"
+  <apn carrier="Palau Mobile"
       mcc="552"
       mnc="80"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Mobinil Web"
+
+  <apn carrier="Mobinil Web"
       mcc="602"
       mnc="01"
       apn="mobinilweb"
       type="default,supl"
   />
-  <apn
-      carrier="Mobinil WAP"
+  <apn carrier="Mobinil WAP"
       mcc="602"
       mnc="01"
       apn="mobinilwap"
@@ -29116,8 +26823,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Mobinil MMS"
+  <apn carrier="Mobinil MMS"
       mcc="602"
       mnc="01"
       apn="mobinilmms"
@@ -29126,8 +26832,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="vodafone internet"
+  <apn carrier="vodafone internet"
       authtype="3"
       mcc="602"
       mnc="02"
@@ -29136,8 +26841,7 @@
       password="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone WAP"
+  <apn carrier="Vodafone WAP"
       mcc="602"
       mnc="02"
       apn="wap.vodafone.com.eg"
@@ -29148,8 +26852,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Vodafone MMS"
+  <apn carrier="Vodafone MMS"
       authtype="1"
       mcc="602"
       mnc="02"
@@ -29161,8 +26864,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Etisalat WAP"
+  <apn carrier="Etisalat WAP"
       mcc="602"
       mnc="03"
       proxy="10.71.130.29"
@@ -29170,8 +26872,7 @@
       apn="etisalat"
       type="default,supl"
   />
-  <apn
-      carrier="Etisalat MMS"
+  <apn carrier="Etisalat MMS"
       mcc="602"
       mnc="03"
       apn="etisalat"
@@ -29180,8 +26881,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="mobilis wap"
+
+  <apn carrier="mobilis wap"
       mcc="603"
       mnc="01"
       apn="wap"
@@ -29192,8 +26893,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Mobilis internet"
+  <apn carrier="Mobilis internet"
       mcc="603"
       mnc="01"
       apn="internet"
@@ -29202,8 +26902,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Mobilis mms"
+  <apn carrier="Mobilis mms"
       mcc="603"
       mnc="01"
       apn="mms"
@@ -29215,15 +26914,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="djezzy.internet"
+  <apn carrier="djezzy.internet"
       mcc="603"
       mnc="02"
       apn="djezzy.internet"
       type="default,supl"
   />
-  <apn
-      carrier="djezzy.mms"
+  <apn carrier="djezzy.mms"
       mcc="603"
       mnc="02"
       apn="djezzy.mms"
@@ -29234,8 +26931,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="nedjmawap"
+  <apn carrier="nedjmawap"
       mcc="603"
       mnc="03"
       apn="nedjmawap"
@@ -29246,8 +26942,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Nedjma.dz"
+  <apn carrier="Nedjma.dz"
       mcc="603"
       mnc="03"
       apn="internet"
@@ -29255,8 +26950,7 @@
       password="nedjma"
       type="default,supl"
   />
-  <apn
-      carrier="nedjmamms"
+  <apn carrier="nedjmamms"
       mcc="603"
       mnc="03"
       apn="nedjmamms"
@@ -29268,8 +26962,8 @@
       mmsport="3128"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+
+  <apn carrier="Internet"
       mcc="604"
       mnc="00"
       apn="internet1.meditel.ma"
@@ -29278,8 +26972,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Imedia"
+  <apn carrier="Imedia"
       mcc="604"
       mnc="00"
       apn="wap.meditel.ma"
@@ -29290,8 +26983,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="GPRS MMS"
+  <apn carrier="GPRS MMS"
       mcc="604"
       mnc="00"
       apn="mms.meditel.ma"
@@ -29303,8 +26995,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="MobileZone"
+  <apn carrier="MobileZone"
       mcc="604"
       mnc="01"
       apn="wap.iamgprs.ma"
@@ -29312,15 +27003,13 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Internet Mobile"
+  <apn carrier="Internet Mobile"
       mcc="604"
       mnc="01"
       apn="www.iamgprs1.ma"
       type="default,supl"
   />
-  <apn
-      carrier="MMS IAM"
+  <apn carrier="MMS IAM"
       mcc="604"
       mnc="01"
       apn="mmsiam"
@@ -29329,15 +27018,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="WEB"
+  <apn carrier="WEB"
       mcc="604"
       mnc="02"
       apn="www.wana.ma"
       type="default,supl"
   />
-  <apn
-      carrier="WAP"
+  <apn carrier="WAP"
       mcc="604"
       mnc="02"
       apn="www.wana.ma"
@@ -29345,8 +27032,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="604"
       mnc="02"
       apn="mms.wana.ma"
@@ -29355,15 +27041,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="weborange"
+
+  <apn carrier="weborange"
       mcc="605"
       mnc="01"
       apn="weborange"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Orange"
+  <apn carrier="MMS Orange"
       mcc="605"
       mnc="01"
       apn="mms.otun"
@@ -29372,15 +27057,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="605"
       mnc="02"
       apn="internet.tn"
       type="default,supl"
   />
-  <apn
-      carrier="Internet Portail"
+  <apn carrier="Internet Portail"
       authtype="1"
       mcc="605"
       mnc="02"
@@ -29389,8 +27072,7 @@
       password="gprs"
       type="default,supl"
   />
-  <apn
-      carrier="Tunisie Telecom MMS"
+  <apn carrier="Tunisie Telecom MMS"
       authtype="1"
       mcc="605"
       mnc="02"
@@ -29402,16 +27084,14 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Tunisiana-Internet"
+  <apn carrier="Tunisiana-Internet"
       authtype="1"
       mcc="605"
       mnc="03"
       apn="internet.tunisiana.com"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Tunisiana"
+  <apn carrier="MMS Tunisiana"
       mcc="605"
       mnc="03"
       apn="mms.tunisiana.com"
@@ -29423,15 +27103,14 @@
       mmsport="80"
       type="mms"
   />
-  <apn
-      carrier="Libyana"
+
+  <apn carrier="Libyana"
       mcc="606"
       mnc="00"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Libyana MMS"
+  <apn carrier="Libyana MMS"
       mcc="606"
       mnc="00"
       apn="mms"
@@ -29441,64 +27120,57 @@
       mmsc="http://62.240.62.180:80"
       mmsport="8000"
   />
-  <apn
-      carrier="Madar"
+  <apn carrier="Madar"
       mcc="606"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Al-Jeel Phone"
+  <apn carrier="Al-Jeel Phone"
       mcc="606"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Libya Phone"
+  <apn carrier="Libya Phone"
       mcc="606"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Hatef Libya"
+  <apn carrier="Hatef Libya"
       mcc="606"
       mnc="06"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Gamcel"
+
+  <apn carrier="Gamcel"
       mcc="607"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Africel"
+  <apn carrier="Africel"
       mcc="607"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Comium"
+  <apn carrier="Comium"
       mcc="607"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="QCell"
+  <apn carrier="QCell"
       mcc="607"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS SN"
+
+  <apn carrier="Orange MMS SN"
       mcc="608"
       mnc="01"
       apn="mms"
@@ -29509,8 +27181,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Wap SN"
+  <apn carrier="Orange Wap SN"
       mcc="608"
       mnc="01"
       apn="wap"
@@ -29520,8 +27191,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Orange Web SN"
+  <apn carrier="Orange Web SN"
       mcc="608"
       mnc="01"
       apn="internet"
@@ -29529,15 +27199,13 @@
       password="internet"
       type="default"
   />
-  <apn
-      carrier="Tigo Internet SN"
+  <apn carrier="Tigo Internet SN"
       mcc="608"
       mnc="02"
       apn="web.sentel.com"
       type="default,supl"
   />
-  <apn
-      carrier="Expresso Internet SN"
+  <apn carrier="Expresso Internet SN"
       mcc="608"
       mnc="03"
       apn="expresso"
@@ -29547,29 +27215,27 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Mattel"
+
+  <apn carrier="Mattel"
       mcc="609"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Chinguitel"
+  <apn carrier="Chinguitel"
       mcc="609"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Mauritel"
+  <apn carrier="Mauritel"
       mcc="609"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange ML MMS"
+
+  <apn carrier="Orange ML MMS"
       mcc="610"
       mnc="02"
       apn="mms"
@@ -29580,8 +27246,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Wap ML"
+  <apn carrier="Orange Wap ML"
       mcc="610"
       mnc="02"
       apn="wap"
@@ -29591,43 +27256,39 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Orange S.A."
+
+  <apn carrier="Orange S.A."
       mcc="611"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Sotelgui"
+  <apn carrier="Sotelgui"
       mcc="611"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Telecel Guinee"
+  <apn carrier="Telecel Guinee"
       mcc="611"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN"
+  <apn carrier="MTN"
       mcc="611"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Cellcom"
+  <apn carrier="Cellcom"
       mcc="611"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Moov Internet CI"
+
+  <apn carrier="Moov Internet CI"
       mcc="612"
       mnc="02"
       apn="moov"
@@ -29637,8 +27298,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="OWORLD CI"
+  <apn carrier="OWORLD CI"
       mcc="612"
       mnc="03"
       apn="orangeciwap"
@@ -29648,8 +27308,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Omms CI"
+  <apn carrier="Omms CI"
       mcc="612"
       mnc="03"
       apn="orangecimms"
@@ -29660,8 +27319,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Koz Internet CI"
+  <apn carrier="Koz Internet CI"
       mcc="612"
       mnc="04"
       apn="gprs.koz.ci"
@@ -29671,8 +27329,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="MTN Internet CI"
+  <apn carrier="MTN Internet CI"
       mcc="612"
       mnc="05"
       apn="web.mtn.ci"
@@ -29680,29 +27337,27 @@
       password="vide"
       type="default"
   />
-  <apn
-      carrier="Telmob"
+
+  <apn carrier="Telmob"
       mcc="613"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="613"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Telecel Faso"
+  <apn carrier="Telecel Faso"
       mcc="613"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS"
+
+  <apn carrier="Orange MMS"
       mcc="614"
       mnc="04"
       apn="orange.mms"
@@ -29713,64 +27368,58 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="614"
       mnc="04"
       apn="orange.ne"
       type="default"
   />
-  <apn
-      carrier="Togo Cell"
+
+  <apn carrier="Togo Cell"
       mcc="615"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Moov"
+  <apn carrier="Moov"
       mcc="615"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Libercom"
+
+  <apn carrier="Libercom"
       mcc="616"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Moov"
+  <apn carrier="Moov"
       mcc="616"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN"
+  <apn carrier="MTN"
       mcc="616"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="BBCOM"
+  <apn carrier="BBCOM"
       mcc="616"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Glo"
+  <apn carrier="Glo"
       mcc="616"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS"
+
+  <apn carrier="Orange MMS"
       mcc="617"
       mnc="01"
       apn="orangemms"
@@ -29781,100 +27430,89 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="617"
       mnc="01"
       apn="orange"
       type="default"
   />
-  <apn
-      carrier="Lonestar Cell"
+
+  <apn carrier="Lonestar Cell"
       mcc="618"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Libercell"
+  <apn carrier="Libercell"
       mcc="618"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Comium"
+  <apn carrier="Comium"
       mcc="618"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Cellcom"
+  <apn carrier="Cellcom"
       mcc="618"
       mnc="07"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="LIBTELCO"
+  <apn carrier="LIBTELCO"
       mcc="618"
       mnc="20"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+
+  <apn carrier="Airtel"
       mcc="619"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tigo"
+  <apn carrier="Tigo"
       mcc="619"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Africell"
+  <apn carrier="Africell"
       mcc="619"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Comium"
+  <apn carrier="Comium"
       mcc="619"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Africell"
+  <apn carrier="Africell"
       mcc="619"
       mnc="05"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Mobitel"
+  <apn carrier="Mobitel"
       mcc="619"
       mnc="25"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Glo"
+
+  <apn carrier="Glo"
       mcc="620"
       mnc="0"
       apn="glowap"
       authtype="0"
       type="default,supl,agps,fota,dun"
   />
-  <apn
-      carrier="Glo mms"
+  <apn carrier="Glo mms"
       mcc="620"
       mnc="0"
       apn="glo mms"
@@ -29884,15 +27522,13 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="MTN Internet GH"
+  <apn carrier="MTN Internet GH"
       apn="internet"
       mcc="620"
       mnc="01"
       type="default"
   />
-  <apn
-      carrier="MTN MMS"
+  <apn carrier="MTN MMS"
       mcc="620"
       mnc="01"
       apn="mtn mms"
@@ -29902,15 +27538,13 @@
       mmsc="http://172.17.3.7"
       mmsport="8080"
   />
-  <apn
-      carrier="Vodafone Internet GH"
+  <apn carrier="Vodafone Internet GH"
       apn="browse"
       mcc="620"
       mnc="02"
       type="default"
   />
-  <apn
-      carrier="Vodafone_mms"
+  <apn carrier="Vodafone_mms"
       mcc="620"
       mnc="02"
       apn="mms"
@@ -29920,15 +27554,13 @@
       mmsc="http://mms.vodaphone.com.gh/mms"
       mmsport="9201"
   />
-  <apn
-      carrier="Tigo Internet GH"
+  <apn carrier="Tigo Internet GH"
       apn="web.tigo.com.gh"
       mcc="620"
       mnc="03"
       type="default"
   />
-  <apn
-      carrier="Tigo mms"
+  <apn carrier="Tigo mms"
       mcc="620"
       mnc="03"
       apn="mms.tigo.com.gh"
@@ -29938,8 +27570,7 @@
       mmsc="http://mms/"
       mmsport="8080"
   />
-  <apn
-      carrier="Airtel Internet GH"
+  <apn carrier="Airtel Internet GH"
       apn="wap"
       mcc="620"
       mnc="06"
@@ -29947,8 +27578,7 @@
       port="9201"
       type="default"
   />
-  <apn
-      carrier="Airtel mms"
+  <apn carrier="Airtel mms"
       mcc="620"
       mnc="06"
       apn="mms/airtel mms"
@@ -29958,8 +27588,7 @@
       mmsc="http://100.1.201.171:10021/mmsc"
       mmsport="8799"
   />
-  <apn
-      carrier="Glo Internet GH"
+  <apn carrier="Glo Internet GH"
       apn="glowap"
       mcc="620"
       mnc="07"
@@ -29970,8 +27599,8 @@
       port="8799"
       type="default"
   />
-  <apn
-      carrier="Airtel Internet"
+
+  <apn carrier="Airtel Internet"
       mcc="621"
       mnc="20"
       password="internet"
@@ -29981,8 +27610,7 @@
       type="default,supl"
       user="internet"
   />
-  <apn
-      carrier="Airtel MMS"
+  <apn carrier="Airtel MMS"
       authtype="1"
       mcc="621"
       mnc="20"
@@ -29993,8 +27621,7 @@
       mmsproxy="172.18.254.5"
       type="mms"
   />
-  <apn
-      carrier="Airtel WAP"
+  <apn carrier="Airtel WAP"
       mcc="621"
       mnc="20"
       apn="wap.ng.zain.com"
@@ -30005,8 +27632,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MTN WAP"
+  <apn carrier="MTN WAP"
       authtype="1"
       mcc="621"
       mnc="30"
@@ -30017,8 +27643,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="MTN ACESS"
+  <apn carrier="MTN ACESS"
       mcc="621"
       mnc="30"
       apn="web.gprs.mtnnigeria.net"
@@ -30027,8 +27652,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MTN MMS"
+  <apn carrier="MTN MMS"
       mcc="621"
       mnc="30"
       apn="web.gprs.mtnnigeria.net"
@@ -30036,8 +27660,7 @@
       mmsproxy="10.199.212.2"
       type="mms"
   />
-  <apn
-      carrier="Glo Direct"
+  <apn carrier="Glo Direct"
       authtype="1"
       mcc="621"
       mnc="50"
@@ -30046,8 +27669,7 @@
       password="gprs"
       type="default,supl"
   />
-  <apn
-      carrier="Glo MMS"
+  <apn carrier="Glo MMS"
       authtype="1"
       mcc="621"
       mnc="50"
@@ -30059,81 +27681,72 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="etisalat WAP"
+  <apn carrier="etisalat WAP"
       mcc="621"
-      mnc="60"
-      proxy="10.71.170.5"
+      mnc="60" proxy="10.71.170.5"
       port="8080"
       apn="etisalat"
       type="default,supl"
   />
-  <apn
-      carrier="etisalat MMS"
+  <apn carrier="etisalat MMS"
       mcc="621"
       mnc="60"
       apn="etisalat"
       mmsc="http://10.71.170.30:38090/was"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+
+  <apn carrier="Airtel"
       mcc="622"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tawali"
+  <apn carrier="Tawali"
       mcc="622"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tigo"
+  <apn carrier="Tigo"
       mcc="622"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Salam"
+  <apn carrier="Salam"
       mcc="622"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="CTP"
+
+  <apn carrier="CTP"
       mcc="623"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="TC"
+  <apn carrier="TC"
       mcc="623"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange"
+  <apn carrier="Orange"
       mcc="623"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Nationlink"
+  <apn carrier="Nationlink"
       mcc="623"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange CM"
+
+  <apn carrier="Orange CM"
       mcc="624"
       mnc="02"
       apn="orangecmgprs"
@@ -30146,36 +27759,34 @@
       mmsport="8080"
       type="default,mms"
   />
-  <apn
-      carrier="CVMOVEL"
+
+  <apn carrier="CVMOVEL"
       mcc="625"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="T+"
+  <apn carrier="T+"
       mcc="625"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="CSTmovel"
+
+  <apn carrier="CSTmovel"
       mcc="626"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange GQ"
+
+  <apn carrier="Orange GQ"
       mcc="627"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange GQ MMS"
+  <apn carrier="Orange GQ MMS"
       mcc="627"
       mnc="01"
       apn="orangemms"
@@ -30187,65 +27798,58 @@
       mmsc="http://192.168.17.34/servlets/mms"
       mmsport="8080"
   />
-  <apn
-      carrier="Hits GQ"
+  <apn carrier="Hits GQ"
       mcc="627"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Libertis"
+
+  <apn carrier="Libertis"
       mcc="628"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Moov"
+  <apn carrier="Moov"
       mcc="628"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="628"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Azur"
+  <apn carrier="Azur"
       mcc="628"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="629"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Libertis Telecom"
+  <apn carrier="Libertis Telecom"
       mcc="629"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Vodacom Internet CD"
+
+  <apn carrier="Vodacom Internet CD"
       mcc="630"
       mnc="01"
       apn="vodanet"
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Vodacom MMS"
+  <apn carrier="Vodacom MMS"
       mcc="630"
       mnc="01"
       apn="vodalive"
@@ -30255,204 +27859,184 @@
       mmsc="http://172.24.97.1/mmsc"
       mmsport="8080"
   />
-  <apn
-      carrier="Tigo Internet CD"
+  <apn carrier="Tigo Internet CD"
       mcc="630"
       mnc="89"
       apn="tigo.web"
       type="default"
   />
-  <apn
-      carrier="UNITEL"
+
+  <apn carrier="UNITEL"
       mcc="631"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MOVICEL"
+  <apn carrier="MOVICEL"
       mcc="631"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Areeba"
+
+  <apn carrier="Areeba"
       mcc="632"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange"
+  <apn carrier="Orange"
       mcc="632"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Guinetel"
+  <apn carrier="Guinetel"
       mcc="632"
       mnc="07"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Cable &amp; Wireless"
+
+  <apn carrier="Cable &amp; Wireless"
       mcc="633"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Mediatech International"
+  <apn carrier="Mediatech International"
       mcc="633"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="633"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Zain SD"
+
+  <apn carrier="Zain SD"
       mcc="634"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN"
+  <apn carrier="MTN"
       mcc="634"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Sudani One"
+  <apn carrier="Sudani One"
       mcc="634"
       mnc="07"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Privet Network"
+  <apn carrier="Privet Network"
       mcc="634"
       mnc="09"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN"
+
+  <apn carrier="MTN"
       mcc="635"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Rwandatel"
+  <apn carrier="Rwandatel"
       mcc="635"
       mnc="12"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tigo"
+  <apn carrier="Tigo"
       mcc="635"
       mnc="13"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="635"
       mnc="14"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="ETH-MTN"
+
+  <apn carrier="ETH-MTN"
       mcc="636"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Telesom"
+
+  <apn carrier="Telesom"
       mcc="637"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Somafone"
+  <apn carrier="Somafone"
       mcc="637"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Nationlink"
+  <apn carrier="Nationlink"
       mcc="637"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Hormuud"
+  <apn carrier="Hormuud"
       mcc="637"
       mnc="25"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Golis"
+  <apn carrier="Golis"
       mcc="637"
       mnc="30"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Unittel"
+  <apn carrier="Unittel"
       mcc="637"
       mnc="57"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Nationlink Telecom"
+  <apn carrier="Nationlink Telecom"
       mcc="637"
       mnc="60"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Somtel"
+  <apn carrier="Somtel"
       mcc="637"
       mnc="71"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Telcom"
+  <apn carrier="Telcom"
       mcc="637"
       mnc="82"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Evatis"
+
+  <apn carrier="Evatis"
       mcc="638"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="safaricom GPRS"
+
+  <apn carrier="safaricom GPRS"
       mcc="639"
       mnc="02"
       apn="safaricom"
@@ -30463,8 +28047,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="safaricom mms"
+  <apn carrier="safaricom mms"
       mcc="639"
       mnc="02"
       apn="safaricom"
@@ -30476,15 +28059,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Airtel Internet"
+  <apn carrier="Airtel Internet"
       mcc="639"
       mnc="03"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel mms"
+  <apn carrier="Airtel mms"
       mcc="639"
       mnc="03"
       apn="mms"
@@ -30494,25 +28075,21 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="639"
       mnc="03"
       apn="ke.celtel.com"
       type="default,supl"
   />
-  <apn
-      carrier="mms"
+  <apn carrier="mms"
       mcc="639"
       mnc="03"
       apn="ke.celtel.com"
-      mmsc="http://mms.ke.celtel.com/servlets/mms"
-      mmsproxy="172.30.8.50"
+      mmsc="http://mms.ke.celtel.com/servlets/mms" mmsproxy="172.30.8.50"
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Yu Internet"
+  <apn carrier="Yu Internet"
       mcc="639"
       mnc="05"
       apn="Internet"
@@ -30523,15 +28100,13 @@
       mmsc="http://10.4.16.22/servlets/mms"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Yu WAP"
+  <apn carrier="Yu WAP"
       mcc="639"
       mnc="05"
       apn="Yu internet"
       type="default,supl"
   />
-  <apn
-      carrier="Yu mms"
+  <apn carrier="Yu mms"
       mcc="639"
       mnc="05"
       apn="Yu"
@@ -30540,15 +28115,13 @@
       mmsc="http://10.4.16.22/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Orange Internet"
+  <apn carrier="Orange Internet"
       mcc="639"
       mnc="07"
       apn="bew.orange.co.ke"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="639"
       mnc="07"
       apn="mms.orange.co.ke"
@@ -30558,8 +28131,8 @@
       mmsc="http://10.36.16.5/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Vodacom WAP"
+
+  <apn carrier="Vodacom WAP"
       mcc="640"
       mnc="04"
       apn="Wap"
@@ -30567,23 +28140,21 @@
       port="9401"
       type="default,supl"
   />
-  <apn
-      carrier="Vodacom MMS"
+  <apn carrier="Vodacom MMS"
       mcc="640"
       mnc="04"
       apn="mms"
       mmsc="http://10.154.0.12/mms/"
       type="mms"
   />
-  <apn
-      carrier="Airtel Internet UG"
+
+  <apn carrier="Airtel Internet UG"
       apn="internet"
       mcc="641"
       mnc="01"
       type="default"
   />
-  <apn
-      carrier="MTN Internet UG"
+  <apn carrier="MTN Internet UG"
       apn="yellopix.mtn.co.ug"
       mcc="641"
       mnc="10"
@@ -30591,8 +28162,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="UTL Internet UG"
+  <apn carrier="UTL Internet UG"
       apn="utweb"
       mcc="641"
       mnc="11"
@@ -30600,23 +28170,20 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Orange Internet UG"
+  <apn carrier="Orange Internet UG"
       mcc="641"
       mnc="14"
       apn="orange.ug"
       type="default"
   />
-  <apn
-      carrier="Orange MMS"
+  <apn carrier="Orange MMS"
       mcc="641"
       mnc="14"
       apn="orangemms"
       mmsc="http://mms/"
       type="mms"
   />
-  <apn
-      carrier="Warid Telecom Internet UG"
+  <apn carrier="Warid Telecom Internet UG"
       apn="web.waridtel.co.ug"
       mcc="641"
       mnc="22"
@@ -30624,100 +28191,90 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Spacetel"
+
+  <apn carrier="Spacetel"
       mcc="642"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Tempo"
+  <apn carrier="Tempo"
       mcc="642"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Onatel"
+  <apn carrier="Onatel"
       mcc="642"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Smart Mobile"
+  <apn carrier="Smart Mobile"
       mcc="642"
       mnc="07"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="HiTs Telecom"
+  <apn carrier="HiTs Telecom"
       mcc="642"
       mnc="08"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Leo"
+  <apn carrier="Leo"
       mcc="642"
       mnc="82"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="mCel"
+
+  <apn carrier="mCel"
       mcc="643"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Movitel"
+  <apn carrier="Movitel"
       mcc="643"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Vodacom"
+  <apn carrier="Vodacom"
       mcc="643"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+
+  <apn carrier="Airtel"
       mcc="645"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTN"
+  <apn carrier="MTN"
       mcc="645"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="ZAMTEL"
+  <apn carrier="ZAMTEL"
       mcc="645"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MG Internet"
+
+  <apn carrier="Orange MG Internet"
       mcc="646"
       mnc="02"
       apn="orangenet"
       type="default,supl,agps,fota,dun"
       authtype="0"
   />
-  <apn
-      carrier="Orange MG MMS"
+  <apn carrier="Orange MG MMS"
       mcc="646"
       mnc="02"
       apn="orangemms"
@@ -30728,8 +28285,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange World MG"
+  <apn carrier="Orange World MG"
       mcc="646"
       mnc="02"
       apn="orangeworld"
@@ -30739,8 +28295,8 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Orange World re"
+
+  <apn carrier="Orange World re"
       mcc="647"
       mnc="00"
       apn="orangerun"
@@ -30748,8 +28304,7 @@
       password="orange"
       type="default,supl"
   />
-  <apn
-      carrier="Orange MMS Réunion"
+  <apn carrier="Orange MMS Réunion"
       mcc="647"
       mnc="00"
       apn="orangerun.acte"
@@ -30760,8 +28315,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange RE"
+  <apn carrier="Orange RE"
       mcc="647"
       mnc="00"
       apn="orangerun"
@@ -30769,8 +28323,7 @@
       password="orange"
       type="default"
   />
-  <apn
-      carrier="OnlyWap"
+  <apn carrier="OnlyWap"
       mcc="647"
       mnc="02"
       apn="onlywap"
@@ -30781,8 +28334,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="OnlyMMS"
+  <apn carrier="OnlyMMS"
       mcc="647"
       mnc="02"
       apn="onlymms"
@@ -30794,15 +28346,13 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Full Internet SRR"
+  <apn carrier="Full Internet SRR"
       mcc="647"
       mnc="10"
       apn="sl2sfr"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="647"
       mnc="10"
       apn="mmssfr"
@@ -30813,8 +28363,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="GPRS SRR"
+  <apn carrier="GPRS SRR"
       mcc="647"
       mnc="10"
       apn="wapsfr"
@@ -30824,8 +28373,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Coriolis WAP"
+  <apn carrier="Coriolis WAP"
       mcc="647"
       mnc="10"
       apn="fnetcoriolis"
@@ -30833,8 +28381,7 @@
       mvno_match_data="12"
       mvno_type="gid"
   />
-  <apn
-      carrier="Coriolis MMS"
+  <apn carrier="Coriolis MMS"
       mcc="647"
       mnc="10"
       mmsc="http://mmscoriolis"
@@ -30845,64 +28392,59 @@
       mvno_match_data="12"
       mvno_type="gid"
   />
-  <apn
-      carrier="Telecel"
+
+  <apn carrier="Telecel"
       mcc="648"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Econet"
+  <apn carrier="Econet"
       mcc="648"
       mnc="04"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="MTC"
+
+  <apn carrier="MTC"
       mcc="649"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="switch"
+  <apn carrier="switch"
       mcc="649"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Leo"
+  <apn carrier="Leo"
       mcc="649"
       mnc="03"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="TNM"
+
+  <apn carrier="TNM"
       mcc="650"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Airtel"
+  <apn carrier="Airtel"
       mcc="650"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="VCL Internet GPRS"
+
+  <apn carrier="VCL Internet GPRS"
       mcc="651"
       mnc="01"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="VCL MMS GPRS"
+  <apn carrier="VCL MMS GPRS"
       mcc="651"
       mnc="01"
       apn="mms"
@@ -30911,8 +28453,8 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange BW MMS"
+
+  <apn carrier="Orange BW MMS"
       mcc="652"
       mnc="02"
       apn="mms.orange.co.bw"
@@ -30921,8 +28463,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Orange WAP BW"
+  <apn carrier="Orange WAP BW"
       mcc="652"
       mnc="02"
       apn="internet.orange.co.bw"
@@ -30930,30 +28471,30 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Swazi MTN"
+
+  <apn carrier="Swazi MTN"
       mcc="653"
       mnc="10"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="HURI - SNPT"
+
+  <apn carrier="HURI - SNPT"
       mcc="654"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="LTE.Vodacom"
+
+  <apn carrier="LTE.Vodacom"
       mcc="655"
       mnc="01"
       apn="lte.vodacom.za"
       user_editable="0"
       type="default"
   />
-  <apn
-      carrier="Internet.Vodacom"
+
+  <apn carrier="Internet.Vodacom"
       mcc="655"
       mnc="01"
       apn="internet"
@@ -30962,8 +28503,7 @@
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="MMS.Vodacom"
+  <apn carrier="MMS.Vodacom"
       mcc="655"
       mnc="01"
       apn="lte.vodacom.za"
@@ -30973,8 +28513,7 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Smart.Vodacom"
+  <apn carrier="Smart.Vodacom"
       mcc="655"
       mnc="01"
       apn="internet"
@@ -30982,8 +28521,7 @@
       user_editable="0"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS.Vodacom"
+  <apn carrier="MMS.Vodacom"
       mcc="655"
       mnc="01"
       apn="mms.vodacom.net"
@@ -30993,15 +28531,13 @@
       type="mms"
       user_editable="0"
   />
-  <apn
-      carrier="Telkom Mobile Internet"
+  <apn carrier="Telkom Mobile Internet"
       mcc="655"
       mnc="02"
       apn="internet"
       type="default,supl"
   />
-  <apn
-      carrier="Telkom Mobile MMS"
+  <apn carrier="Telkom Mobile MMS"
       mcc="655"
       mnc="02"
       apn="mms"
@@ -31010,8 +28546,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Cell C GPRS"
+  <apn carrier="Cell C GPRS"
       mcc="655"
       mnc="07"
       apn="internet"
@@ -31019,8 +28554,7 @@
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="Cell C MMS"
+  <apn carrier="Cell C MMS"
       mcc="655"
       mnc="07"
       apn="mms"
@@ -31029,19 +28563,16 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="VIRGIN_INTERNET_1"
+  <apn carrier="VIRGIN_INTERNET_1"
       mcc="655"
-      mnc="07"
-      mvno_match_data="6550710"
+      mnc="07" mvno_match_data="6550710"
       mvno_type="imsi"
       apn="vdata"
       proxy="196.31.116.241"
       port="8080"
       type="default,supl"
   />
-  <apn
-      carrier="VIRGIN_INTERNET_2"
+  <apn carrier="VIRGIN_INTERNET_2"
       mcc="655"
       mnc="07"
       apn="vdata"
@@ -31051,8 +28582,7 @@
       mvno_match_data="6550710"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Virgin_MMS_1"
+  <apn carrier="Virgin_MMS_1"
       mcc="655"
       mnc="07"
       apn="vmms"
@@ -31063,8 +28593,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Virgin_MMS_2"
+  <apn carrier="Virgin_MMS_2"
       mcc="655"
       mnc="07"
       apn="vmms"
@@ -31075,8 +28604,7 @@
       mvno_match_data="6550710"
       mvno_type="imsi"
   />
-  <apn
-      carrier="RBM Internet"
+  <apn carrier="RBM Internet"
       mcc="655"
       mnc="07"
       apn="mobile.redbullmobile.co.za"
@@ -31086,8 +28614,7 @@
       mvno_match_data="6550713"
       mvno_type="imsi"
   />
-  <apn
-      carrier="Redbull MMS"
+  <apn carrier="Redbull MMS"
       mcc="655"
       mnc="07"
       apn="mms"
@@ -31098,8 +28625,7 @@
       mvno_match_data="6550713"
       mvno_type="imsi"
   />
-  <apn
-      carrier="MTN GPRS"
+  <apn carrier="MTN GPRS"
       mcc="655"
       mnc="10"
       apn="myMTN"
@@ -31108,8 +28634,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MTN MMS"
+  <apn carrier="MTN MMS"
       authtype="1"
       mcc="655"
       mnc="10"
@@ -31121,36 +28646,33 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Eritel"
+  <apn carrier="Eritel"
       mcc="657"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="DigiCell"
+
+  <apn carrier="DigiCell"
       mcc="702"
       mnc="67"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Smart"
+  <apn carrier="Smart"
       mcc="702"
       mnc="99"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Internet CLARO"
+
+  <apn carrier="Internet CLARO"
       mcc="704"
       mnc="01"
       apn="internet.ideasclaro"
       type="default,supl"
   />
-  <apn
-      carrier="MMS CLARO"
+  <apn carrier="MMS CLARO"
       mcc="704"
       mnc="01"
       apn="mms.ideasclaro"
@@ -31159,15 +28681,13 @@
       mmsc="http://mms.ideasclaro.com:8002"
       type="mms"
   />
-  <apn
-      carrier="Broadband TIGO"
+  <apn carrier="Broadband TIGO"
       mcc="704"
       mnc="02"
       apn="broadband.tigo.gt"
       type="default,supl"
   />
-  <apn
-      carrier="MMS TIGO"
+  <apn carrier="MMS TIGO"
       mcc="704"
       mnc="02"
       apn="mms.tigo.gt"
@@ -31176,8 +28696,7 @@
       mmsc="http://mms"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="704"
       mnc="03"
       apn="internet.movistar.gt"
@@ -31185,8 +28704,7 @@
       password="movistargt"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="704"
       mnc="03"
       apn="wap.movistar.gt"
@@ -31196,8 +28714,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="704"
       mnc="03"
       apn="mms.movistar.gt"
@@ -31208,8 +28725,7 @@
       mmsc="http://mms.movistar.gt"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="704"
       mnc="030"
       apn="internet.movistar.gt"
@@ -31220,8 +28736,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="704"
       mnc="030"
       apn="mms.movistar.gt"
@@ -31235,15 +28750,14 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Internet CLARO"
+
+  <apn carrier="Internet CLARO"
       mcc="706"
       mnc="01"
       apn="internet.ideasclaro"
       type="default,supl"
   />
-  <apn
-      carrier="MMS CLARO"
+  <apn carrier="MMS CLARO"
       mcc="706"
       mnc="01"
       apn="mms.ideasclaro"
@@ -31252,15 +28766,13 @@
       mmsc="http://mms.ideasclaro.com:8002"
       type="mms"
   />
-  <apn
-      carrier="Digicel Internet"
+  <apn carrier="Digicel Internet"
       mcc="706"
       mnc="02"
       apn="web.digicelsv.com"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="706"
       mnc="02"
       apn="wap.digicelsv.com"
@@ -31269,15 +28781,13 @@
       mmsc="http://mmc.digiceljamaica.com/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Internet Tigo"
+  <apn carrier="Internet Tigo"
       mcc="706"
       mnc="03"
       apn="internet.tigo.sv"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Tigo"
+  <apn carrier="MMS Tigo"
       mcc="706"
       mnc="03"
       apn="mms.tigo.sv"
@@ -31286,8 +28796,7 @@
       mmsc="http://mms"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="706"
       mnc="04"
       apn="internet.movistar.sv"
@@ -31295,8 +28804,7 @@
       password="movistarsv"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="706"
       mnc="04"
       apn="wap.movistar.sv"
@@ -31306,8 +28814,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="706"
       mnc="04"
       apn="mms.movistar.sv"
@@ -31318,8 +28825,7 @@
       mmsc="http://mms.movistar.sv"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="706"
       mnc="040"
       apn="internet.movistar.sv"
@@ -31328,8 +28834,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="706"
       mnc="040"
       apn="mms.movistar.sv"
@@ -31341,15 +28846,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet Claro"
+
+  <apn carrier="Internet Claro"
       mcc="708"
       mnc="00"
       apn="internet.ideasclaro"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Claro"
+  <apn carrier="MMS Claro"
       mcc="708"
       mnc="00"
       apn="mms.ideasclaro"
@@ -31358,15 +28862,13 @@
       mmsc="http://10.6.32.27/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Internet Claro"
+  <apn carrier="Internet Claro"
       mcc="708"
       mnc="001"
       apn="internet.ideasclaro"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Claro"
+  <apn carrier="MMS Claro"
       mcc="708"
       mnc="001"
       apn="mms.ideasclaro"
@@ -31375,15 +28877,13 @@
       mmsc="http://10.6.32.27/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="INTERNET TIGO"
+  <apn carrier="INTERNET TIGO"
       mcc="708"
       mnc="02"
       apn="internet.tigo.hn"
       type="default,supl"
   />
-  <apn
-      carrier="MMS TIGO"
+  <apn carrier="MMS TIGO"
       mcc="708"
       mnc="02"
       apn="mms.tigo.hn"
@@ -31392,45 +28892,40 @@
       mmsc="http://mms"
       type="mms"
   />
-  <apn
-      carrier="Honduras:Digicel:Internet"
-      mcc="708"
-      mnc="04"
-      apn="web.digicelhn.com"
-      authtype="1"
-      type="default"
+  <apn carrier='Honduras:Digicel:Internet'
+      mcc='708'
+      mnc='04'
+      apn='web.digicelhn.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Honduras:Digicel:Mms"
-      mcc="708"
-      mnc="04"
-      apn="wap.digicelhn.com"
-      authtype="1"
-      mmsc="http://mms.digicelsv.com/servlets/mms"
-      mmsproxy="172.26.5.12"
-      mmsport="9201"
-      type="mms"
+  <apn carrier='Honduras:Digicel:Mms'
+      mcc='708'
+      mnc='04'
+      apn='wap.digicelhn.com'
+      authtype='1'
+      mmsc='http://mms.digicelsv.com/servlets/mms'
+      mmsproxy='172.26.5.12'
+      mmsport='9201'
+      type='mms'
   />
-  <apn
-      carrier="Honduras:Digicel:Modem"
-      mcc="708"
-      mnc="04"
-      apn="wap.digicelhn.com"
-      port="8080"
-      authtype="1"
-      proxy="172.26.5.12"
-      mmsc="http://www.digicelive.com"
-      type="dun"
+  <apn carrier='Honduras:Digicel:Modem'
+      mcc='708'
+      mnc='04'
+      apn='wap.digicelhn.com'
+      port='8080'
+      authtype='1'
+      proxy='172.26.5.12'
+      mmsc='http://www.digicelive.com'
+      type='dun'
   />
-  <apn
-      carrier="INTERNET TIGO"
+  <apn carrier="INTERNET TIGO"
       mcc="708"
       mnc="020"
       apn="internet.tigo.hn"
       type="default,supl"
   />
-  <apn
-      carrier="MMS TIGO"
+  <apn carrier="MMS TIGO"
       mcc="708"
       mnc="020"
       apn="mms.tigo.hn"
@@ -31439,27 +28934,25 @@
       mmsc="http://mms"
       type="mms"
   />
-  <apn
-      carrier="Honduras:Digicel:Internet:2"
-      mcc="708"
-      mnc="040"
-      apn="web.digicelhn.com"
-      authtype="1"
-      type="default"
+  <apn carrier='Honduras:Digicel:Internet:2'
+      mcc='708'
+      mnc='040'
+      apn='web.digicelhn.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Honduras:Digicel:Mms:2"
-      mcc="708"
-      mnc="040"
-      apn="wap.digicelhn.com"
-      authtype="1"
-      mmsc="http://mms.digicelsv.com/servlets/mms"
-      mmsproxy="172.26.5.12"
-      mmsport="9201"
-      type="mms"
+  <apn carrier='Honduras:Digicel:Mms:2'
+      mcc='708'
+      mnc='040'
+      apn='wap.digicelhn.com'
+      authtype='1'
+      mmsc='http://mms.digicelsv.com/servlets/mms'
+      mmsproxy='172.26.5.12'
+      mmsport='9201'
+      type='mms'
   />
-  <apn
-      carrier="Enitel WEB"
+
+  <apn carrier="Enitel WEB"
       mcc="710"
       mnc="21"
       apn="internet.ideasalo.ni"
@@ -31468,8 +28961,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Enitel MMS"
+  <apn carrier="Enitel MMS"
       mcc="710"
       mnc="21"
       apn="mms.indeasalo.ni"
@@ -31481,8 +28973,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="710"
       mnc="30"
       apn="internet.movistar.ni"
@@ -31490,8 +28981,7 @@
       password="movistarni"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="710"
       mnc="30"
       apn="wap.movistar.ni"
@@ -31501,8 +28991,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="710"
       mnc="30"
       apn="mms.movistar.ni"
@@ -31513,8 +29002,7 @@
       mmsc="http://mms.movistar.ni"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="710"
       mnc="300"
       apn="internet.movistar.ni"
@@ -31522,8 +29010,7 @@
       password="movistarni"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="710"
       mnc="300"
       apn="wap.movistar.ni"
@@ -31533,8 +29020,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="710"
       mnc="300"
       apn="mms.movistar.ni"
@@ -31545,8 +29031,7 @@
       mmsc="http://mms.movistar.ni"
       type="mms"
   />
-  <apn
-      carrier="Enitel WEB"
+  <apn carrier="Enitel WEB"
       mcc="710"
       mnc="73"
       apn="internet.ideasalo.ni"
@@ -31555,8 +29040,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Enitel MMS"
+  <apn carrier="Enitel MMS"
       mcc="710"
       mnc="73"
       apn="mms.indeasalo.ni"
@@ -31568,8 +29052,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Enitel WEB"
+  <apn carrier="Enitel WEB"
       mcc="710"
       mnc="730"
       apn="internet.ideasalo.ni"
@@ -31578,8 +29061,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Enitel MMS"
+  <apn carrier="Enitel MMS"
       mcc="710"
       mnc="730"
       apn="mms.indeasalo.ni"
@@ -31591,15 +29073,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="KOLBI 3G"
+
+  <apn carrier="KOLBI 3G"
       mcc="712"
       mnc="01"
       apn="kolbi3g"
       type="default,supl"
   />
-  <apn
-      carrier="Costar Rica:Kolbi:Modem"
+  <apn carrier="Costar Rica:Kolbi:Modem"
       mcc="712"
       mnc="01"
       apn="kolbi"
@@ -31608,8 +29089,7 @@
       mmsc="http://mimundokolbi.ice.cr"
       mmsport="8080"
   />
-  <apn
-      carrier="Multimedia"
+  <apn carrier="Multimedia"
       mcc="712"
       mnc="01"
       apn="kolbi3g"
@@ -31621,8 +29101,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Kolbi_Multimedia"
+  <apn carrier="Kolbi_Multimedia"
       mcc="712"
       mnc="01"
       apn="kolbimundo"
@@ -31631,16 +29110,14 @@
       mmsc="http://mmsice"
       type="mms"
   />
-  <apn
-      carrier="Kolbi"
+  <apn carrier="Kolbi"
       mcc="712"
       mnc="02"
       apn="kolbi3g"
       type="default,supl"
       authtype="1"
   />
-  <apn
-      carrier="Kolbi_Multimedia"
+  <apn carrier="Kolbi_Multimedia"
       mcc="712"
       mnc="02"
       apn="kolbimundo"
@@ -31649,8 +29126,7 @@
       mmsc="http://mmsice"
       type="mms"
   />
-  <apn
-      carrier="Multimedia"
+  <apn carrier="Multimedia"
       mcc="712"
       mnc="02"
       apn="kolbi3g"
@@ -31662,8 +29138,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet CLARO CR"
+ <apn carrier="Internet CLARO CR"
       mcc="712"
       mnc="03"
       apn="internet.ideasclaro"
@@ -31671,8 +29146,7 @@
       password=""
       type="default,supl"
   />
-  <apn
-      carrier="MMS CLARO CR"
+  <apn carrier="MMS CLARO CR"
       mcc="712"
       mnc="03"
       apn="mms.ideasclaro"
@@ -31683,8 +29157,7 @@
       mmsc="http://mms.ideasclaro.com:8002"
       type="mms"
   />
-  <apn
-      carrier="Movistar Internet"
+  <apn carrier="Movistar Internet"
       mcc="712"
       mnc="04"
       apn="internet.movistar.cr"
@@ -31692,8 +29165,8 @@
       password="movistarcr"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+
+  <apn carrier="Movistar WAP"
       mcc="712"
       mnc="04"
       apn="wap.movistar.cr"
@@ -31703,8 +29176,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="712"
       mnc="04"
       apn="mms.movistar.cr"
@@ -31715,15 +29187,13 @@
       mmsc="http://mms.movistar.cr"
       type="mms"
   />
-  <apn
-      carrier="Internet Tuyo"
+  <apn carrier="Internet Tuyo"
       mcc="712"
       mnc="019"
       apn="tm7datos"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Tuyo"
+  <apn carrier="MMS Tuyo"
       mcc="712"
       mnc="019"
       apn="tm7mms"
@@ -31732,15 +29202,13 @@
       mmsc="http://mmsc.tuyomovil.com:1981"
       type="mms"
   />
-  <apn
-      carrier="Internet Tuyo"
+  <apn carrier="Internet Tuyo"
       mcc="712"
       mnc="190"
       apn="tm7datos"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Tuyo"
+  <apn carrier="MMS Tuyo"
       mcc="712"
       mnc="190"
       apn="tm7mms"
@@ -31749,22 +29217,20 @@
       mmsc="http://mmsc.tuyomovil.com:1981"
       type="mms"
   />
-  <apn
-      carrier="Internet Fulmovil"
+  <apn carrier="Internet Fulmovil"
       mcc="712"
       mnc="20"
       apn="datos.fulmovil.cr"
       type="default,supl"
   />
-  <apn
-      carrier="Internet"
+
+  <apn carrier="Internet"
       mcc="714"
       mnc="01"
       apn="apn01.cwpanama.com.pa"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="714"
       mnc="01"
       apn="apn02.cwpanama.com.pa"
@@ -31773,8 +29239,7 @@
       mmsc="http://mms.zonamovil.com.pa"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="714"
       mnc="02"
       apn="internet.movistar.pa"
@@ -31782,8 +29247,7 @@
       password="movistarpa"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="714"
       mnc="02"
       apn="wap.movistar.pa"
@@ -31793,8 +29257,7 @@
       port="80"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="714"
       mnc="02"
       apn="mms.movistar.pa"
@@ -31805,8 +29268,7 @@
       mmsc="http://mms.movistar.pa"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="714"
       mnc="020"
       apn="internet.movistar.pa"
@@ -31815,8 +29277,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="714"
       mnc="020"
       apn="mms.movistar.pa"
@@ -31828,8 +29289,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="WEB Claro"
+  <apn carrier="WEB Claro"
       mcc="714"
       mnc="03"
       apn="web.claro.com.pa"
@@ -31838,8 +29298,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Claro"
+  <apn carrier="MMS Claro"
       mcc="714"
       mnc="03"
       apn="mms.claro.com.pa"
@@ -31851,15 +29310,13 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Digicel Internet"
+  <apn carrier="Digicel Internet"
       mcc="714"
       mnc="04"
       apn="web.digicelpanama.com"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="714"
       mnc="04"
       apn="wap.digicelpanama.com"
@@ -31868,27 +29325,25 @@
       mmsc="http://mmc.digicelpanama.com/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Panama:Digicel:Internet:2"
-      mcc="714"
-      mnc="040"
-      apn="web.digicelpanama.com"
-      authtype="1"
-      type="default"
+  <apn carrier='Panama:Digicel:Internet:2'
+      mcc='714'
+      mnc='040'
+      apn='web.digicelpanama.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Panama:Digicel:Mms:2"
-      mcc="714"
-      mnc="040"
-      apn="wap.digicelpanama.com"
-      authtype="1"
-      mmsc="http://mmc.digicelpanama.com/servlets/mms"
-      mmsproxy="172.27.99.99"
-      mmsport="9201"
-      type="mms"
+  <apn carrier='Panama:Digicel:Mms:2'
+      mcc='714'
+      mnc='040'
+      apn='wap.digicelpanama.com'
+      authtype='1'
+      mmsc='http://mmc.digicelpanama.com/servlets/mms'
+      mmsproxy='172.27.99.99'
+      mmsport='9201'
+      type='mms'
   />
-  <apn
-      carrier="Movistar INTERNET"
+
+  <apn carrier="Movistar INTERNET"
       mcc="716"
       mnc="06"
       apn="movistar.pe"
@@ -31897,8 +29352,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="716"
       mnc="06"
       apn="wap.movistar.pe"
@@ -31909,8 +29363,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="716"
       mnc="06"
       apn="mms.movistar.pe"
@@ -31922,8 +29375,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="716"
       mnc="06"
       apn="ims"
@@ -31931,8 +29383,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Claro DATOS"
+  <apn carrier="Claro DATOS"
       mcc="716"
       mnc="10"
       apn="claro.pe"
@@ -31941,8 +29392,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Claro MMS"
+  <apn carrier="Claro MMS"
       mcc="716"
       mnc="10"
       apn="mms.claro.pe"
@@ -31954,8 +29404,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="716"
       mnc="010"
       apn="ims"
@@ -31963,8 +29412,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Bitel - Internet"
+  <apn carrier="Bitel - Internet"
       mcc="716"
       mnc="15"
       apn="bitel"
@@ -31973,8 +29421,7 @@
       protocol="IP"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Bitel - MMS"
+  <apn carrier="Bitel - MMS"
       mcc="716"
       mnc="15"
       apn="bitel-mms"
@@ -31986,8 +29433,7 @@
       protocol="IP"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Entel PE"
+  <apn carrier="Entel PE"
       mcc="716"
       mnc="17"
       apn="entel.pe"
@@ -31995,8 +29441,7 @@
       type="default,dun"
       protocol="IP"
   />
-  <apn
-      carrier="Entel MMS"
+  <apn carrier="Entel MMS"
       mcc="716"
       mnc="17"
       apn="mms.entel.pe"
@@ -32007,8 +29452,7 @@
       type="mms"
       protocol="IP"
   />
-  <apn
-      carrier="Entel Location"
+  <apn carrier="Entel Location"
       mcc="716"
       mnc="17"
       apn="location.entel.pe"
@@ -32018,62 +29462,58 @@
       type="supl"
       protocol="IP"
   />
-  <apn
-      carrier="Quam_WEB"
-      mcc="722"
-      mnc="01"
-      apn="internet.movil"
-      user="internet"
-      password="internet"
-      authtype="1"
-      type="default"
-      mvno_type="spn"
-      mvno_match_data="QUAM"
+
+  <apn carrier='Quam_WEB'
+      mcc='722'
+      mnc='01'
+      apn='internet.movil'
+      user='internet'
+      password='internet'
+      authtype='1'
+      type='default'
+      mvno_type='spn'
+      mvno_match_data='QUAM'
   />
-  <apn
-      carrier="Quam_MMS"
-      mcc="722"
-      mnc="01"
-      apn="mms.movil"
-      user="mms"
-      password="mms"
-      mmsc="http://mms.quam.com.ar"
-      mmsproxy="200.68.32.239"
-      mmsport="9090"
-      authtype="1"
-      type="mms"
-      mvno_type="spn"
-      mvno_match_data="QUAM"
+  <apn carrier='Quam_MMS'
+      mcc='722'
+      mnc='01'
+      apn='mms.movil'
+      user='mms'
+      password='mms'
+      mmsc='http://mms.quam.com.ar'
+      mmsproxy='200.68.32.239'
+      mmsport='9090'
+      authtype='1'
+      type='mms'
+      mvno_type='spn'
+      mvno_match_data='QUAM'
   />
-  <apn
-      carrier="Quam_WEB"
-      mcc="722"
-      mnc="01"
-      apn="internet.movil"
-      user="internet"
-      password="internet"
-      authtype="1"
-      type="default"
-      mvno_type="spn"
-      mvno_match_data="CELULAR"
+  <apn carrier='Quam_WEB'
+      mcc='722'
+      mnc='01'
+      apn='internet.movil'
+      user='internet'
+      password='internet'
+      authtype='1'
+      type='default'
+      mvno_type='spn'
+      mvno_match_data='CELULAR'
   />
-  <apn
-      carrier="Quam_MMS"
-      mcc="722"
-      mnc="01"
-      apn="mms.movil"
-      user="mms"
-      password="mms"
-      mmsc="http://mms.quam.com.ar"
-      mmsproxy="200.68.32.239"
-      mmsport="9090"
-      authtype="1"
-      type="mms"
-      mvno_type="spn"
-      mvno_match_data="CELULAR"
+  <apn carrier='Quam_MMS'
+      mcc='722'
+      mnc='01'
+      apn='mms.movil'
+      user='mms'
+      password='mms'
+      mmsc='http://mms.quam.com.ar'
+      mmsproxy='200.68.32.239'
+      mmsport='9090'
+      authtype='1'
+      type='mms'
+      mvno_type='spn'
+      mvno_match_data='CELULAR'
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="722"
       mnc="07"
       apn="wap.gprs.unifon.com.ar"
@@ -32082,8 +29522,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="722"
       mnc="07"
       apn="wap.gprs.unifon.com.ar"
@@ -32092,8 +29531,7 @@
       password="wap"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="722"
       mnc="07"
       apn="mms.gprs.unifon.com.ar"
@@ -32105,8 +29543,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="722"
       mnc="070"
       apn="wap.gprs.unifon.com.ar"
@@ -32115,8 +29552,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="722"
       mnc="070"
       apn="wap.gprs.unifon.com.ar"
@@ -32125,8 +29561,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="722"
       mnc="070"
       apn="mms.gprs.unifon.com.ar"
@@ -32138,8 +29573,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Movistar WAP"
+ <apn carrier="Movistar WAP"
       mcc="722"
       mnc="10"
       apn="wap.gprs.unifon.com.ar"
@@ -32148,8 +29582,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="722"
       mnc="10"
       apn="wap.gprs.unifon.com.ar"
@@ -32158,8 +29591,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="722"
       mnc="10"
       apn="mms.gprs.unifon.com.ar"
@@ -32171,24 +29603,21 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Claro AR"
+  <apn carrier="Claro AR"
       mcc="722"
       mnc="31"
       apn="igprs.claro.com.ar"
       mmsc="http://mms.claro.com.ar"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Claro AR"
+  <apn carrier="Claro AR"
       mcc="722"
       mnc="310"
       apn="igprs.claro.com.ar"
       mmsc="http://mms.claro.com.ar"
       type="default,supl,mms"
   />
-  <apn
-      carrier="MMS GPRS AR"
+  <apn carrier="MMS GPRS AR"
       mcc="722"
       mnc="310"
       apn="mms.ctimovil.com.ar"
@@ -32200,8 +29629,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="722"
       mnc="310"
       apn="ims"
@@ -32209,8 +29637,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Personal Datos"
+  <apn carrier="Personal Datos"
       mcc="722"
       mnc="34"
       apn="datos.personal.com"
@@ -32219,8 +29646,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Argentina:Personal:DUN"
+    <apn carrier="Argentina:Personal:DUN"
       mcc="722"
       mnc="34"
       apn="internet.personal.com"
@@ -32229,8 +29655,7 @@
       password="internet"
       authtype="0"
   />
-  <apn
-      carrier="Personal MMS"
+  <apn carrier="Personal MMS"
       mcc="722"
       mnc="34"
       apn="mms"
@@ -32242,21 +29667,19 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Argentina:Personal :MMS"
-      mcc="722"
-      mnc="340"
-      apn="mms"
-      authtype="0"
-      mmsc="http://mms.personal.com"
-      mmsproxy="172.25.7.31"
-      mmsport="8080"
-      type="mms"
-      user="mms"
-      password="mms"
+  <apn carrier='Argentina:Personal :MMS'
+      mcc='722'
+      mnc='340'
+      apn='mms'
+      authtype='0'
+      mmsc='http://mms.personal.com'
+      mmsproxy='172.25.7.31'
+      mmsport='8080'
+      type='mms'
+      user='mms'
+      password='mms'
   />
-  <apn
-      carrier="Personal Datos"
+  <apn carrier="Personal Datos"
       mcc="722"
       mnc="341"
       apn="datos.personal.com"
@@ -32265,8 +29688,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Argentina:Personal: DUN"
+  <apn carrier="Argentina:Personal: DUN"
       mcc="722"
       mnc="341"
       apn="internet.personal.com"
@@ -32275,8 +29697,7 @@
       password="internet"
       authtype="0"
   />
-  <apn
-      carrier="Personal MMS"
+  <apn carrier="Personal MMS"
       mcc="722"
       mnc="341"
       apn="mms"
@@ -32288,50 +29709,44 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="TIM Connect"
+
+  <apn carrier="TIM Connect"
       mcc="724"
       mnc="02"
       apn="timbrasil.br"
       user="tim"
-      password="tim"
-      protocol="IPV4V6"
+      password="tim" protocol="IPV4V6"
       mmsc="http://mms.tim.br"
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="TIM Connect"
+  <apn carrier="TIM Connect"
       mcc="724"
       mnc="03"
       apn="timbrasil.br"
       user="tim"
-      password="tim"
-      protocol="IPV4V6"
+      password="tim" protocol="IPV4V6"
       mmsc="http://mms.tim.br"
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="TIM Connect"
+  <apn carrier="TIM Connect"
       mcc="724"
       mnc="04"
       apn="timbrasil.br"
       user="tim"
-      password="tim"
-      protocol="IPV4V6"
+      password="tim" protocol="IPV4V6"
       mmsc="http://mms.tim.br"
       mmsproxy="200.179.66.242"
       mmsport="8080"
       authtype="1"
       type="default,supl,mms"
   />
-  <apn
-      carrier="Claro Dados"
+  <apn carrier="Claro Dados"
       mcc="724"
       mnc="05"
       apn="java.claro.com.br"
@@ -32340,8 +29755,7 @@
       authtype="2"
       type="default,internet"
   />
-  <apn
-      carrier="Claro Foto"
+  <apn carrier="Claro Foto"
       mcc="724"
       mnc="05"
       apn="mms.claro.com.br"
@@ -32353,8 +29767,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="724"
       mnc="05"
       apn="ims"
@@ -32362,8 +29775,7 @@
       protocol="IPV6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Vivo MMS"
+  <apn carrier="Vivo MMS"
       mcc="724"
       mnc="06"
       apn="mms.vivo.com.br"
@@ -32375,8 +29787,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Vivo Internet"
+  <apn carrier="Vivo Internet"
       mcc="724"
       mnc="06"
       apn="zap.vivo.com.br"
@@ -32385,8 +29796,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Vivo WAP"
+  <apn carrier="Vivo WAP"
       mcc="724"
       mnc="06"
       apn="wap.vivo.com.br"
@@ -32397,8 +29807,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="SCTL MMS"
+  <apn carrier="SCTL MMS"
       mcc="724"
       mnc="07"
       apn="mms.sercomtel.com.br"
@@ -32409,8 +29818,7 @@
       mmsport="8799"
       type="mms"
   />
-  <apn
-      carrier="SCTL GPRS"
+  <apn carrier="SCTL GPRS"
       mcc="724"
       mnc="07"
       apn="sercomtel.com.br"
@@ -32418,8 +29826,7 @@
       password="sercomtel"
       type="default,supl"
   />
-  <apn
-      carrier="Vivo Internet"
+  <apn carrier="Vivo Internet"
       mcc="724"
       mnc="10"
       apn="zap.vivo.com.br"
@@ -32428,8 +29835,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Vivo MMS"
+  <apn carrier="Vivo MMS"
       mcc="724"
       mnc="10"
       apn="mms.vivo.com.br"
@@ -32441,8 +29847,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Vivo WAP"
+  <apn carrier="Vivo WAP"
       mcc="724"
       mnc="10"
       apn="wap.vivo.com.br"
@@ -32453,8 +29858,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Vivo MMS"
+  <apn carrier="Vivo MMS"
       mcc="724"
       mnc="11"
       apn="mms.vivo.com.br"
@@ -32468,8 +29872,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Vivo Internet"
+  <apn carrier="Vivo Internet"
       mcc="724"
       mnc="11"
       apn="zap.vivo.com.br"
@@ -32478,8 +29881,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Vivo WAP"
+  <apn carrier="Vivo WAP"
       mcc="724"
       mnc="11"
       apn="wap.vivo.com.br"
@@ -32490,8 +29892,7 @@
       type="default"
       authtype="1"
   />
-  <apn
-      carrier="Claro Dados"
+  <apn carrier="Claro Dados"
       mcc="724"
       mnc="12"
       apn="java.claro.com.br"
@@ -32500,8 +29901,7 @@
       authtype="2"
       type="default,internet"
   />
-  <apn
-      carrier="Claro Foto"
+  <apn carrier="Claro Foto"
       mcc="724"
       mnc="12"
       apn="mms.claro.com.br"
@@ -32513,49 +29913,44 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Sercomtel:Dados"
-      mcc="724"
-      mnc="15"
-      apn="sercomtel.com.br"
-      authtype="1"
-      type="default"
-      user="sercomtel"
-      password="sercomtel"
+  <apn carrier='Sercomtel:Dados'
+      mcc='724'
+      mnc='15'
+      apn='sercomtel.com.br'
+      authtype='1'
+      type='default'
+      user='sercomtel'
+      password='sercomtel'
   />
-  <apn
-      carrier="Sercomtel:MMS"
-      mcc="724"
-      mnc="15"
-      apn="mms.sercomtel.com.br"
-      authtype="1"
-      mmsc="http://mms.claro.com.br"
-      mmsproxy="200.169.126.10"
-      mmsport="8799"
-      type="mms"
-      user="sercomtel"
-      password="sercomtel"
+  <apn carrier='Sercomtel:MMS'
+      mcc='724'
+      mnc='15'
+      apn='mms.sercomtel.com.br'
+      authtype='1'
+      mmsc='http://mms.claro.com.br'
+      mmsproxy='200.169.126.10'
+      mmsport='8799'
+      type='mms'
+      user='sercomtel'
+      password='sercomtel'
   />
-  <apn
-      carrier="Sercomtel:Modem"
-      mcc="724"
-      mnc="15"
-      apn="sercomtel.com.br"
-      authtype="1"
-      type="dun"
-      user="sercomtel"
-      password="sercomtel"
+  <apn carrier='Sercomtel:Modem'
+      mcc='724'
+      mnc='15'
+      apn='sercomtel.com.br'
+      authtype='1'
+      type='dun'
+      user='sercomtel'
+      password='sercomtel'
   />
-  <apn
-      carrier="Oi GPRS Internet"
+ <apn carrier="Oi GPRS Internet"
       mcc="724"
       mnc="16"
       apn="gprs.oi.com.br"
       protocol="IPV4V6"
       type="default,supl"
   />
-  <apn
-      carrier="BrT Modem"
+  <apn carrier="BrT Modem"
       mcc="724"
       mnc="16"
       apn="brt.br"
@@ -32564,8 +29959,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS GPRS"
+  <apn carrier="MMS GPRS"
       mcc="724"
       mnc="16"
       apn="mmsgprs.oi.com.br"
@@ -32578,8 +29972,7 @@
       protocol="IPV4V6"
       type="mms"
   />
-  <apn
-      carrier="BrT MMS"
+  <apn carrier="BrT MMS"
       mcc="724"
       mnc="16"
       apn="mms.brt.br"
@@ -32591,8 +29984,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="TelemigC GPRS"
+  <apn carrier="TelemigC GPRS"
       mcc="724"
       mnc="19"
       apn="gprs.telemigcelular.com.br"
@@ -32600,8 +29992,7 @@
       password="celular"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Telemig"
+  <apn carrier="MMS Telemig"
       mcc="724"
       mnc="19"
       apn="mmsgprs.telemigcelular.com.br"
@@ -32612,8 +30003,7 @@
       mmsport="8080"
       type="mms"
   />
-  <apn
-      carrier="Vivo Internet"
+  <apn carrier="Vivo Internet"
       mcc="724"
       mnc="23"
       apn="zap.vivo.com.br"
@@ -32622,8 +30012,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Vivo MMS"
+  <apn carrier="Vivo MMS"
       mcc="724"
       mnc="23"
       apn="mms.vivo.com.br"
@@ -32635,8 +30024,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Vivo WAP"
+  <apn carrier="Vivo WAP"
       mcc="724"
       mnc="23"
       apn="wap.vivo.com.br"
@@ -32647,8 +30035,7 @@
       type="default"
       authtype="1"
   />
-  <apn
-      carrier="OI:INTERNET:2"
+  <apn carrier="OI:INTERNET:2"
       mcc="724"
       mnc="24"
       apn="gprs.oi.com.br"
@@ -32659,8 +30046,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Oi:MMS:2"
+  <apn carrier="Oi:MMS:2"
       mcc="724"
       mnc="24"
       apn="mmsgprs.oi.com.br"
@@ -32674,8 +30060,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="AmazôniaC GPRS"
+  <apn carrier="AmazôniaC GPRS"
       mcc="724"
       mnc="24"
       apn="gprs.amazoniacelular.com.br"
@@ -32684,8 +30069,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="AmazôniaC MMS"
+  <apn carrier="AmazôniaC MMS"
       mcc="724"
       mnc="24"
       apn="mmsgprs.amazoniacelular.com.br"
@@ -32697,129 +30081,115 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Oi GPRS Internet"
+  <apn carrier="Oi GPRS Internet"
       mcc="724"
-      mnc="31"
-      protocol="IPV4V6"
+      mnc="31" protocol="IPV4V6"
       apn="gprs.oi.com.br"
       type="default,supl"
   />
-  <apn
-      carrier="MMS GPRS"
+  <apn carrier="MMS GPRS"
       mcc="724"
       mnc="31"
       apn="mmsgprs.oi.com.br"
       user="oimms"
-      password="oioioi"
-      protocol="IPV4V6"
+      password="oioioi" protocol="IPV4V6"
       mmsc="http://200.222.42.204:8002"
       mmsproxy="192.168.10.50"
       mmsport="3128"
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="CTBC:Dados:1"
-      mcc="724"
-      mnc="32"
-      apn="ctbc.br"
-      authtype="1"
-      type="default"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:Dados:1'
+      mcc='724'
+      mnc='32'
+      apn='ctbc.br'
+      authtype='1'
+      type='default'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:Modem:1"
-      mcc="724"
-      mnc="32"
-      apn="ctbc.br"
-      authtype="1"
-      type="dun"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:Modem:1'
+      mcc='724'
+      mnc='32'
+      apn='ctbc.br'
+      authtype='1'
+      type='dun'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:MMS:1"
-      mcc="724"
-      mnc="32"
-      apn="mms.ctbc.br"
-      authtype="1"
-      mmsc="http://mms.ctbccelular.com.br/was"
-      mmsproxy="172.29.7.70"
-      mmsport="8080"
-      type="mms"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:MMS:1'
+      mcc='724'
+      mnc='32'
+      apn='mms.ctbc.br'
+      authtype='1'
+      mmsc='http://mms.ctbccelular.com.br/was'
+      mmsproxy='172.29.7.70'
+      mmsport='8080'
+      type='mms'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:Dados:2"
-      mcc="724"
-      mnc="33"
-      apn="ctbc.br"
-      authtype="1"
-      type="default"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:Dados:2'
+      mcc='724'
+      mnc='33'
+      apn='ctbc.br'
+      authtype='1'
+      type='default'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:Modem:2"
-      mcc="724"
-      mnc="33"
-      apn="ctbc.br"
-      authtype="1"
-      type="dun"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:Modem:2'
+      mcc='724'
+      mnc='33'
+      apn='ctbc.br'
+      authtype='1'
+      type='dun'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:MMS:2"
-      mcc="724"
-      mnc="33"
-      apn="mms.ctbc.br"
-      authtype="1"
-      mmsc="http://mms.ctbccelular.com.br/was"
-      mmsproxy="172.29.7.70"
-      mmsport="8080"
-      type="mms"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:MMS:2'
+      mcc='724'
+      mnc='33'
+      apn='mms.ctbc.br'
+      authtype='1'
+      mmsc='http://mms.ctbccelular.com.br/was'
+      mmsproxy='172.29.7.70'
+      mmsport='8080'
+      type='mms'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:Dados:3"
-      mcc="724"
-      mnc="34"
-      apn="ctbc.br"
-      authtype="1"
-      type="default"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:Dados:3'
+      mcc='724'
+      mnc='34'
+      apn='ctbc.br'
+      authtype='1'
+      type='default'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:Modem:3"
-      mcc="724"
-      mnc="34"
-      apn="ctbc.br"
-      authtype="1"
-      type="dun"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:Modem:3'
+      mcc='724'
+      mnc='34'
+      apn='ctbc.br'
+      authtype='1'
+      type='dun'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="CTBC:MMS:3"
-      mcc="724"
-      mnc="34"
-      apn="mms.ctbc.br"
-      authtype="1"
-      mmsc="http://mms.ctbccelular.com.br/was"
-      mmsproxy="172.29.7.70"
-      mmsport="8080"
-      type="mms"
-      user="CTBC"
-      password="1212"
+  <apn carrier='CTBC:MMS:3'
+      mcc='724'
+      mnc='34'
+      apn='mms.ctbc.br'
+      authtype='1'
+      mmsc='http://mms.ctbccelular.com.br/was'
+      mmsproxy='172.29.7.70'
+      mmsport='8080'
+      type='mms'
+      user='CTBC'
+      password='1212'
   />
-  <apn
-      carrier="Claro Dados"
+  <apn carrier="Claro Dados"
       mcc="724"
       mnc="38"
       apn="java.claro.com.br"
@@ -32828,8 +30198,7 @@
       authtype="2"
       type="default,internet"
   />
-  <apn
-      carrier="Claro Foto"
+  <apn carrier="Claro Foto"
       mcc="724"
       mnc="38"
       apn="mms.claro.com.br"
@@ -32841,39 +30210,36 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Nextel MMS"
-      mcc="724"
-      mnc="39"
-      apn="mms.nextel3g.net.br"
-      authtype="0"
-      mmsc="http://3gmms.nextel3g.net.br"
-      mmsproxy="129.192.129.104"
-      mmsport="8080"
-      type="mms"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+  <apn carrier='Nextel MMS'
+      mcc='724'
+      mnc='39'
+      apn='mms.nextel3g.net.br'
+      authtype='0'
+      mmsc='http://3gmms.nextel3g.net.br'
+      mmsproxy='129.192.129.104'
+      mmsport='8080'
+      type='mms'
+      protocol='IPV4V6'
+      roaming_protocol='IPV4V6'
   />
-  <apn
-      carrier="Nextel WAP"
-      mcc="724"
-      mnc="39"
-      apn="wap.nextel3g.net.br"
-      authtype="0"
-      type="default,dun"
-      protocol="IPV4V6"
-      roaming_protocol="IPV4V6"
+  <apn carrier='Nextel WAP'
+      mcc='724'
+      mnc='39'
+      apn='wap.nextel3g.net.br'
+      authtype='0'
+      type='default,dun'
+      protocol='IPV4V6'
+      roaming_protocol='IPV4V6'
   />
-  <apn
-      carrier="Porto Seguro Conecta"
-      mcc="724"
-      mnc="54"
-      authtype="0"
-      type="default,dun"
-      apn="portoconecta.br"
+  <apn carrier='Porto Seguro Conecta'
+      mcc='724'
+      mnc='54'
+      authtype='0'
+      type='default,dun'
+      apn='portoconecta.br'
   />
-  <apn
-      carrier="Internet Movil"
+
+  <apn carrier="Internet Movil"
       mcc="730"
       mnc="01"
       apn="bam.entelpcs.cl"
@@ -32882,8 +30248,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Entel"
+  <apn carrier="MMS Entel"
       mcc="730"
       mnc="01"
       apn="mms.entelpcs.cl"
@@ -32895,27 +30260,24 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet Nextel"
-      mcc="730"
-      mnc="09"
-      apn="wap.nextelmovil.cl"
-      authtype="0"
-      type="default"
+  <apn carrier='Internet Nextel'
+      mcc='730'
+      mnc='09'
+      apn='wap.nextelmovil.cl'
+      authtype='0'
+      type='default'
   />
-  <apn
-      carrier="MMS Nextel"
-      mcc="730"
-      mnc="09"
-      apn="mms.nextelmovil.cl"
-      authtype="0"
-      mmsc="http://3gmms.nextelmovil.cl"
-      mmsproxy="129.192.129.104"
-      mmsport="8080"
-      type="mms"
+  <apn carrier='MMS Nextel'
+      mcc='730'
+      mnc='09'
+      apn='mms.nextelmovil.cl'
+      authtype='0'
+      mmsc='http://3gmms.nextelmovil.cl'
+      mmsproxy='129.192.129.104'
+      mmsport='8080'
+      type='mms'
   />
-  <apn
-      carrier="Internet Movil"
+  <apn carrier="Internet Movil"
       mcc="730"
       mnc="10"
       apn="bam.entelpcs.cl"
@@ -32924,8 +30286,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Entel"
+  <apn carrier="MMS Entel"
       mcc="730"
       mnc="10"
       apn="mms.entelpcs.cl"
@@ -32937,8 +30298,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Movistar APLICACIONES"
+  <apn carrier="Movistar APLICACIONES"
       mcc="730"
       mnc="02"
       apn="wap.tmovil.cl"
@@ -32949,8 +30309,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="730"
       mnc="02"
       apn="mms.tmovil.cl"
@@ -32964,19 +30323,17 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="BAM Claro"
+  <apn carrier="BAM Claro"
       mcc="730"
       mnc="03"
       apn="bam.clarochile.cl"
       user="clarochile"
       password="clarochile"
       authtype="3"
-      read_only="true"
+      read_only ="true"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS Claro"
+  <apn carrier="MMS Claro"
       mcc="730"
       mnc="03"
       apn="mms.clarochile.cl"
@@ -32986,11 +30343,10 @@
       mmsport="8080"
       mmsc="http://mms.clarochile.cl"
       authtype="1"
-      read_only="true"
+      read_only ="true"
       type="mms"
   />
-  <apn
-      carrier="WAP Claro"
+  <apn carrier="WAP Claro"
       mcc="730"
       mnc="03"
       apn="wap.clarochile.cl"
@@ -32999,16 +30355,15 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="730"
       mnc="03"
       apn="ims"
       type="ims"
       protocol="IP"
+
   />
-  <apn
-      carrier="web"
+  <apn carrier="web"
       mcc="730"
       mnc="07"
       apn="web.gtdmovil.cl"
@@ -33017,8 +30372,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Internet"
+  <apn carrier="Internet"
       mcc="730"
       mnc="08"
       apn="movil.vtr.com"
@@ -33027,8 +30381,7 @@
       authtype="2"
       type="default,supl"
   />
-  <apn
-      carrier="Wap"
+  <apn carrier="Wap"
       mcc="730"
       mnc="08"
       apn="wap.vtr.com"
@@ -33039,8 +30392,7 @@
       authtype="0"
       type="default,supl,dun"
   />
-  <apn
-      carrier="Bam"
+  <apn carrier="Bam"
       mcc="730"
       mnc="08"
       apn="bam.vtr.com"
@@ -33049,8 +30401,7 @@
       authtype="2"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="730"
       mnc="08"
       apn="mms.vtr.com"
@@ -33062,8 +30413,7 @@
       authtype="0"
       type="mms"
   />
-  <apn
-      carrier="Internet Movil"
+  <apn carrier="Internet Movil"
       mcc="730"
       mnc="10"
       apn="bam.entelpcs.cl"
@@ -33072,8 +30422,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Entel PCS"
+  <apn carrier="MMS Entel PCS"
       mcc="730"
       mnc="10"
       apn="mms.entelpcs.cl"
@@ -33085,8 +30434,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+ <apn carrier="Movistar INTERNET"
       mcc="732"
       mnc="001"
       apn="internet.movistar.com.co"
@@ -33095,8 +30443,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+ <apn carrier="Movistar WAP"
       mcc="732"
       mnc="001"
       apn="wap.movistar.com.co"
@@ -33106,8 +30453,7 @@
       proxy="192.168.222.7"
       port="9001"
   />
-  <apn
-      carrier="Movistar MMS"
+ <apn carrier="Movistar MMS"
       mcc="732"
       mnc="001"
       apn="mms.movistar.com.co"
@@ -33119,31 +30465,28 @@
       mmsport="9001"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
-      mcc="732"
-      mnc="12"
-      apn="internet.movistar.com.co"
-      authtype="1"
-      type="default, dun"
-      user="movistar"
-      password="movistar"
+  <apn carrier='Movistar INTERNET'
+      mcc='732'
+      mnc='12'
+      apn='internet.movistar.com.co'
+      authtype='1'
+      type='default, dun'
+      user='movistar'
+      password='movistar'
   />
-  <apn
-      carrier="Movistar MMS"
-      mcc="732"
-      mnc="12"
-      apn="mms.movistar.com.co"
-      authtype="1"
-      mmsc="http://mms.movistar.com.co"
-      mmsproxy="192.168.222.7"
-      mmsport="9001"
-      type="mms"
-      user="movistar"
-      password="movistar"
+  <apn carrier='Movistar MMS'
+      mcc='732'
+      mnc='12'
+      apn='mms.movistar.com.co'
+      authtype='1'
+      mmsc='http://mms.movistar.com.co'
+      mmsproxy='192.168.222.7'
+      mmsport='9001'
+      type='mms'
+      user='movistar'
+      password='movistar'
   />
-  <apn
-      carrier="WEB Claro"
+  <apn carrier="WEB Claro"
       mcc="732"
       mnc="101"
       apn="internet.comcel.com.co"
@@ -33153,8 +30496,7 @@
       type="default"
       user_editable="0"
   />
-  <apn
-      carrier="MMS CLARO"
+  <apn carrier="MMS CLARO"
       mcc="732"
       mnc="101"
       apn="mms.comcel.com.co"
@@ -33166,8 +30508,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="732"
       mnc="101"
       apn="ims"
@@ -33175,8 +30516,7 @@
       protocol="IPV4V6"
       roaming_protocol="IPV4V6"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="732"
       mnc="102"
       apn="internet.movistar.com.co"
@@ -33185,8 +30525,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+ <apn carrier="Movistar WAP"
       mcc="732"
       mnc="102"
       apn="wap.movistar.com.co"
@@ -33196,8 +30535,7 @@
       proxy="192.168.222.7"
       port="9001"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="732"
       mnc="102"
       apn="mms.movistar.com.co"
@@ -33209,8 +30547,7 @@
       mmsport="9001"
       type="mms"
   />
-  <apn
-      carrier="TIGO WEB"
+  <apn carrier="TIGO WEB"
       mcc="732"
       mnc="103"
       apn="web.colombiamovil.com.co"
@@ -33219,8 +30556,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="TIGO Multimedia"
+  <apn carrier="TIGO Multimedia"
       mcc="732"
       mnc="103"
       apn="mms.colombiamovil.com.co"
@@ -33232,8 +30568,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet ETB"
+  <apn carrier="Internet ETB"
       mcc="732"
       mnc="103"
       apn="moviletb.net.co"
@@ -33244,8 +30579,7 @@
       mvno_match_data="ETB MOVI"
       mvno_type="spn"
   />
-  <apn
-      carrier="Internet ETB"
+  <apn carrier="Internet ETB"
       mcc="732"
       mnc="103"
       apn="moviletb.net.co"
@@ -33256,8 +30590,7 @@
       mvno_match_data="ETB MOVI"
       mvno_type="spn"
   />
-  <apn
-      carrier="Internet Éxito"
+  <apn carrier="Internet Éxito"
       mcc="732"
       mnc="103"
       apn="movilexito.net.co"
@@ -33266,8 +30599,7 @@
       mvno_match_data="movil exito"
       mvno_type="spn"
   />
-  <apn
-      carrier="UFFMOVIL"
+  <apn carrier="UFFMOVIL"
       mcc="732"
       mnc="103"
       apn="web.uffmovil.com"
@@ -33276,8 +30608,7 @@
       mvno_match_data="Uff!"
       mvno_type="spn"
   />
-  <apn
-      carrier="UNE"
+  <apn carrier="UNE"
       mcc="732"
       mnc="103"
       apn="www.une.net.co"
@@ -33288,8 +30619,7 @@
       mvno_match_data="UNE"
       mvno_type="spn"
   />
-  <apn
-      carrier="TIGO WEB"
+  <apn carrier="TIGO WEB"
       mcc="732"
       mnc="111"
       apn="web.colombiamovil.com.co"
@@ -33298,8 +30628,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="TIGO Multimedia"
+  <apn carrier="TIGO Multimedia"
       mcc="732"
       mnc="111"
       apn="mms.colombiamovil.com.co"
@@ -33311,8 +30640,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet ETB"
+  <apn carrier="Internet ETB"
       mcc="732"
       mnc="111"
       apn="moviletb.net.co"
@@ -33323,8 +30651,7 @@
       mvno_match_data="ETB MOVIL"
       mvno_type="spn"
   />
-  <apn
-      carrier="Internet Éxito"
+  <apn carrier="Internet Éxito"
       mcc="732"
       mnc="111"
       apn="movilexito.net.co"
@@ -33333,8 +30660,7 @@
       mvno_match_data="movil exito"
       mvno_type="spn"
   />
-  <apn
-      carrier="UFFMOVIL"
+  <apn carrier="UFFMOVIL"
       mcc="732"
       mnc="111"
       apn="web.uffmovil.com"
@@ -33343,8 +30669,7 @@
       mvno_match_data="Uff!"
       mvno_type="spn"
   />
-  <apn
-      carrier="UNE"
+  <apn carrier="UNE"
       mcc="732"
       mnc="111"
       apn="www.une.net.co"
@@ -33355,8 +30680,7 @@
       mvno_match_data="UNE"
       mvno_type="spn"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="732"
       mnc="123"
       apn="internet.movistar.com.co"
@@ -33365,8 +30689,7 @@
       authtype="1"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="732"
       mnc="123"
       apn="wap.movistar.com.co"
@@ -33374,8 +30697,7 @@
       password="movistar"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="732"
       mnc="123"
       apn="mms.movistar.com.co"
@@ -33387,8 +30709,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Virgin Mobile"
+  <apn carrier="Virgin Mobile"
       mcc="732"
       mnc="123"
       apn="web.vmc.net.co"
@@ -33397,8 +30718,7 @@
       mvno_match_data="Virgin Mobile"
       mvno_type="spn"
   />
-  <apn
-      carrier="IMS"
+  <apn carrier="IMS"
       mcc="732"
       mnc="123"
       apn="ims"
@@ -33406,39 +30726,35 @@
       protocol="IP"
       roaming_protocol="IP"
   />
-  <apn
-      carrier="Avantel"
+  <apn carrier="Avantel"
       mcc="732"
       mnc="130"
       apn="lte.avantel.com.co"
       authtype="0"
       type="default"
   />
-  <apn
-      carrier="ETB 4G"
+  <apn carrier="ETB 4G"
       mcc="732"
       mnc="187"
       apn="internetmovil.etb.net.co"
       authtype="0"
       type="default"
   />
-  <apn
-      carrier="Digitel 412"
+
+  <apn carrier="Digitel 412"
       mcc="734"
       mnc="01"
       apn="internet.digitel.ve"
       type="default,supl"
   />
-  <apn
-      carrier="Venezuela:Digitel:MODEM:1"
+  <apn carrier="Venezuela:Digitel:MODEM:1"
       mcc="734"
       mnc="01"
       apn="gprsweb.digitel.ve"
       type="dun"
       authtype="1"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="734"
       mnc="01"
       apn="expresate.digitel.ve"
@@ -33447,23 +30763,20 @@
       mmsc="http://mms.412.com.ve/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Digitel 412"
+  <apn carrier="Digitel 412"
       mcc="734"
       mnc="02"
       apn="internet.digitel.ve"
       type="default,supl"
   />
-  <apn
-      carrier="Venezuela:Digitel:MODEM:2"
+  <apn carrier="Venezuela:Digitel:MODEM:2"
       mcc="734"
       mnc="02"
       apn="gprsweb.digitel.ve"
       authtype="1"
       type="dun"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="734"
       mnc="02"
       apn="expresate.digitel.ve"
@@ -33472,23 +30785,20 @@
       mmsc="http://mms.412.com.ve/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Digitel 412"
+  <apn carrier="Digitel 412"
       mcc="734"
       mnc="03"
       apn="internet.digitel.ve"
       type="default,supl"
   />
-  <apn
-      carrier="Venezuela:Digitel:MODEM:3"
+  <apn carrier="Venezuela:Digitel:MODEM:3"
       mcc="734"
       mnc="03"
       apn="gprsweb.digitel.ve"
       authtype="1"
       type="dun"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="734"
       mnc="03"
       apn="expresate.digitel.ve"
@@ -33497,15 +30807,13 @@
       mmsc="http://mms.412.com.ve/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="734"
       mnc="04"
       apn="internet.movistar.ve"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="734"
       mnc="04"
       apn="mms.movistar.ve"
@@ -33514,8 +30822,7 @@
       mmsc="http://mms.movistar.com.ve:8088/mms"
       type="mms"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="734"
       mnc="04"
       apn="wap.movistar.ve"
@@ -33523,15 +30830,13 @@
       port="9001"
       type="default"
   />
-  <apn
-      carrier="MODEM"
+  <apn carrier="MODEM"
       mcc="734"
       mnc="06"
       apn="int.movilnet.com.ve"
       type="default,supl"
   />
-  <apn
-      carrier="MMS"
+  <apn carrier="MMS"
       mcc="734"
       mnc="06"
       apn="mm.movilnet.com.ve"
@@ -33540,8 +30845,8 @@
       mmsc="http://mms2.movilnet.com.ve/servlets/mms"
       type="mms"
   />
-  <apn
-      carrier="VIVA3G"
+
+  <apn carrier="VIVA3G"
       mcc="736"
       mnc="01"
       apn="internet.nuevatel.com"
@@ -33552,8 +30857,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="VIVAMMS"
+  <apn carrier="VIVAMMS"
       mcc="736"
       mnc="01"
       apn="mms.nuevatel.com"
@@ -33565,8 +30869,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="ENTEL WAP GPRS"
+  <apn carrier="ENTEL WAP GPRS"
       mcc="736"
       mnc="02"
       apn="wap.movil.com.bo"
@@ -33577,8 +30880,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="ENTEL MMS GPRS"
+  <apn carrier="ENTEL MMS GPRS"
       mcc="736"
       mnc="02"
       apn="mms.movil.com.bo"
@@ -33590,8 +30892,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="WAPTIGO"
+   <apn carrier="WAPTIGO"
       mcc="736"
       mnc="03"
       apn="wap.tigo.bo"
@@ -33602,8 +30903,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMSTIGO"
+  <apn carrier="MMSTIGO"
       mcc="736"
       mnc="03"
       apn="mms.tigo.bo"
@@ -33615,15 +30915,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Digicel"
+
+  <apn carrier="Digicel"
       mcc="738"
       mnc="01"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Guyana:Digicel:Modem"
+  <apn carrier="Guyana:Digicel:Modem"
       mcc="738"
       mnc="01"
       apn="wap.digicelgy.com"
@@ -33635,8 +30934,7 @@
       proxy="172.20.6.12"
       port="8080"
   />
-  <apn
-      carrier="Guyana:Digicel:Mms"
+  <apn carrier="Guyana:Digicel:Mms"
       mcc="738"
       mnc="01"
       apn="wap.digicelgy.com"
@@ -33648,15 +30946,14 @@
       mmsc="http://mmc.digicelgy.com/servlets/mms"
       mmsport="9201"
   />
-  <apn
-      carrier="GT&amp;T Cellink Plus"
+  <apn carrier="GT&amp;T Cellink Plus"
       mcc="738"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar INTERNET"
+
+  <apn carrier="Movistar INTERNET"
       mcc="740"
       mnc="00"
       apn="internet.movistar.com.ec"
@@ -33664,8 +30961,7 @@
       password="movistar"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="740"
       mnc="00"
       apn="wap.movistar.com.ec"
@@ -33675,8 +30971,7 @@
       port="9001"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="740"
       mnc="00"
       apn="mms.movistar.com.ec"
@@ -33687,15 +30982,13 @@
       mmsc="http://mms.movistar.com.ec:8088/mms/"
       type="mms"
   />
-  <apn
-      carrier="Internet Claro"
+  <apn carrier="Internet Claro"
       mcc="740"
       mnc="01"
       apn="internet.claro.com.ec"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Claro"
+  <apn carrier="MMS Claro"
       mcc="740"
       mnc="01"
       apn="mms.claro.com.ec"
@@ -33707,15 +31000,13 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Internet Claro"
+  <apn carrier="Internet Claro"
       mcc="740"
       mnc="010"
       apn="internet.claro.com.ec"
       type="default,supl"
   />
-  <apn
-      carrier="Claro Internet"
+  <apn carrier="Claro Internet"
       mcc="740"
       mnc="010"
       apn="internet.porta.com.ec"
@@ -33724,8 +31015,7 @@
       authtype="1"
       type="default,supl,dun"
   />
-  <apn
-      carrier="MMS Claro"
+  <apn carrier="MMS Claro"
       mcc="740"
       mnc="010"
       apn="mms.claro.com.ec"
@@ -33737,15 +31027,13 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="CNT 3G"
+  <apn carrier="CNT 3G"
       mcc="740"
       mnc="02"
       apn="internet3gsp.alegro.net.ec"
       type="default,supl"
   />
-  <apn
-      carrier="CNT MMS"
+  <apn carrier="CNT MMS"
       mcc="740"
       mnc="02"
       apn="mms.alegro.net.ec"
@@ -33754,16 +31042,15 @@
       mmsc="http://mms.alegro.net.ec/mms/"
       type="mms"
   />
-  <apn
-      carrier="VOX INTERNET"
+
+  <apn carrier="VOX INTERNET"
       mcc="744"
       mnc="01"
       apn="vox.internet"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Paraguay:Voxx:Modem"
+  <apn carrier="Paraguay:Voxx:Modem"
       mcc="744"
       mnc="01"
       apn="vox.wap"
@@ -33773,8 +31060,7 @@
       mmsc="http://www.vox.com.py/"
       port="8080"
   />
-  <apn
-      carrier="VOX MMS"
+  <apn carrier="VOX MMS"
       mcc="744"
       mnc="01"
       apn="vox.mms"
@@ -33786,8 +31072,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Claro PY"
+  <apn carrier="Claro PY"
       mcc="744"
       mnc="02"
       apn="igprs.claro.com.py"
@@ -33796,8 +31081,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS GPRS PY"
+  <apn carrier="MMS GPRS PY"
       mcc="744"
       mnc="02"
       apn="mms.ctimovil.com.py"
@@ -33809,16 +31093,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="TIGO PY"
+  <apn carrier="TIGO PY"
       mcc="744"
       mnc="04"
       apn="internet.tigo.py"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS Tigo"
+  <apn carrier="MMS Tigo"
       mcc="744"
       mnc="04"
       apn="mms.tigo.py"
@@ -33830,8 +31112,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Personal Datos Py"
+  <apn carrier="Personal Datos Py"
       mcc="744"
       mnc="05"
       apn="internet"
@@ -33840,8 +31121,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Personal MMS Py"
+  <apn carrier="Personal MMS Py"
       mcc="744"
       mnc="05"
       apn="mms"
@@ -33853,49 +31133,45 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="Telesur"
+
+  <apn carrier="Telesur"
       mcc="746"
       mnc="02"
       apn="default"
       type="default,supl"
   />
-  <apn
-      carrier="Suriname:Digicel:Internet"
-      mcc="746"
-      mnc="03"
-      apn="web.digicelsr.com"
-      authtype="1"
-      type="default"
+  <apn carrier='Suriname:Digicel:Internet'
+      mcc='746'
+      mnc='03'
+      apn='web.digicelsr.com'
+      authtype='1'
+      type='default'
   />
-  <apn
-      carrier="Suriname:Digicel:Mms"
-      mcc="746"
-      mnc="03"
-      apn="wap.digicelsr.com"
-      authtype="1"
-      mmsc="http://mmc.digicelsr.com/servlets/mms"
-      mmsproxy="172.20.6.12"
-      mmsport="9201"
-      type="mms"
-      user="wap"
-      password="wap"
+  <apn carrier='Suriname:Digicel:Mms'
+      mcc='746'
+      mnc='03'
+      apn='wap.digicelsr.com'
+      authtype='1'
+      mmsc='http://mmc.digicelsr.com/servlets/mms'
+      mmsproxy='172.20.6.12'
+      mmsport='9201'
+      type='mms'
+      user='wap'
+      password='wap'
   />
-  <apn
-      carrier="Suriname:Digicel:Modem"
-      mcc="746"
-      mnc="03"
-      apn="wap.digicelsr.com"
-      port="8080"
-      authtype="1"
-      proxy="172.20.6.12"
-      mmsc="http://wapdigicel.com"
-      type="dun"
-      user="wap"
-      password="wap"
+  <apn carrier='Suriname:Digicel:Modem'
+      mcc='746'
+      mnc='03'
+      apn='wap.digicelsr.com'
+      port='8080'
+      authtype='1'
+      proxy='172.20.6.12'
+      mmsc='http://wapdigicel.com'
+      type='dun'
+      user='wap'
+      password='wap'
   />
-  <apn
-      carrier="wapANCEL"
+  <apn carrier="wapANCEL"
       mcc="748"
       mnc="01"
       apn="wap"
@@ -33906,8 +31182,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="mmsANCEL"
+  <apn carrier="mmsANCEL"
       mcc="748"
       mnc="01"
       apn="mms"
@@ -33919,16 +31194,14 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="gprsANCEL"
+  <apn carrier="gprsANCEL"
       mcc="748"
       mnc="01"
       apn="gprs.ancel"
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="Movistar INTERNET"
+  <apn carrier="Movistar INTERNET"
       mcc="748"
       mnc="07"
       apn="webapn.movistar.com.uy"
@@ -33936,8 +31209,7 @@
       password="movistar"
       type="default"
   />
-  <apn
-      carrier="Movistar WAP"
+  <apn carrier="Movistar WAP"
       mcc="748"
       mnc="07"
       apn="apnwap.movistar.com.uy"
@@ -33947,8 +31219,7 @@
       port="8080"
       type="default"
   />
-  <apn
-      carrier="Movistar MMS"
+  <apn carrier="Movistar MMS"
       mcc="748"
       mnc="07"
       apn="apnmms.movistar.com.uy"
@@ -33959,8 +31230,7 @@
       mmsc="http://mmsc.movistar.com.uy"
       type="mms"
   />
-  <apn
-      carrier="Claro UY"
+  <apn carrier="Claro UY"
       mcc="748"
       mnc="10"
       apn="igprs.claro.com.uy"
@@ -33969,8 +31239,7 @@
       authtype="1"
       type="default,supl"
   />
-  <apn
-      carrier="MMS GPRS UY"
+  <apn carrier="MMS GPRS UY"
       mcc="748"
       mnc="10"
       apn="mms.ctimovil.com.uy"
@@ -33982,8 +31251,7 @@
       authtype="1"
       type="mms"
   />
-  <apn
-      carrier="ATT M2M Global"
+  <apn carrier="ATT M2M Global"
       mcc="901"
       mnc="44"
       apn="attm2mglobal"