diff --git a/public/json/sources.json b/public/json/sources.json
index e360e9e..1827464 100644
--- a/public/json/sources.json
+++ b/public/json/sources.json
@@ -1,27 +1,31 @@
 {
     "Statewide Aggregate Addresses in Colorado 2019 (Public)": {
-        "url": "https://importdata.riverviewtechnologies.com/coloradoAddresses/map?bbox={bbox}",
         "countries": {
             "US-CO": ["addr:housenumber"]
         },
-        "parameters": [],
         "license": "Public Domain",
         "osm_compatible": "yes",
-        "permission_url": "https://wiki.openstreetmap.org/wiki/Import/Colorado_Addresses"
+        "parameters": [],
+        "permission_url": "https://wiki.openstreetmap.org/wiki/Import/Colorado_Addresses",
+        "url": "https://importdata.riverviewtechnologies.com/coloradoAddresses/map?bbox={bbox}"
     },
     "MapWithAI": {
-        "url": "https://www.mapwith.ai/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox={bbox}",
-        "parameters": [{"parameter": "result_type=road_building_vector_xml", "description": "buildings", "enabled": true}],
         "countries": {
+            "AE": ["highway"],
             "AF": ["highway"],
             "AG": ["highway"],
             "AI": ["highway"],
             "AL": ["highway"],
+            "AM": ["highway"],
             "AO": ["highway"],
             "AR": ["highway"],
+            "AT": ["highway"],
+            "AU": ["highway"],
+            "AZ": ["highway"],
             "BA": ["highway"],
             "BB": ["highway"],
             "BD": ["highway"],
+            "BE": ["highway"],
             "BF": ["highway"],
             "BG": ["highway"],
             "BI": ["highway"],
@@ -33,29 +37,43 @@
             "BS": ["highway"],
             "BT": ["highway"],
             "BW": ["highway"],
+            "BY": ["highway"],
             "BZ": ["highway"],
-            "CA": ["building"],
+            "CA": ["building", "highway"],
             "CD": ["highway"],
             "CF": ["highway"],
             "CG": ["highway"],
+            "CH": ["highway"],
             "CI": ["highway"],
             "CL": ["highway"],
             "CM": ["highway"],
+            "CN": ["highway"],
             "CO": ["highway"],
             "CR": ["highway"],
             "CU": ["highway"],
+            "CY": ["highway"],
+            "CZ": ["highway"],
+            "DE": ["highway"],
             "DJ": ["highway"],
+            "DK": ["highway"],
             "DM": ["highway"],
             "DO": ["highway"],
             "DZ": ["highway"],
             "EC": ["highway"],
+            "EE": ["highway"],
             "EG": ["highway"],
             "EH": ["highway"],
             "ER": ["highway"],
+            "ES": ["highway"],
             "ET": ["highway"],
             "FK": ["highway"],
+            "FI": ["highway"],
+            "FJ": ["highway"],
+            "FR": ["highway"],
             "GA": ["highway"],
+            "GB": ["highway"],
             "GD": ["highway"],
+            "GE": ["highway"],
             "GF": ["highway"],
             "GH": ["highway"],
             "GM": ["highway"],
@@ -71,17 +89,32 @@
             "HT": ["highway"],
             "HU": ["highway"],
             "ID": ["highway"],
+            "IE": ["highway"],
+            "IL": ["highway"],
             "IN": ["highway"],
+            "IQ": ["highway"],
+            "IS": ["highway"],
+            "IT": ["highway"],
             "JM": ["highway"],
+            "JO": ["highway"],
+            "JP": ["highway"],
             "KE": ["highway"],
+            "KG": ["highway"],
             "KH": ["highway"],
             "KN": ["highway"],
             "KY": ["highway"],
+            "KR": ["highway"],
+            "KW": ["highway"],
+            "KZ": ["highway"],
             "LA": ["highway"],
+            "LB": ["highway"],
             "LC": ["highway"],
             "LK": ["highway"],
             "LR": ["highway"],
             "LS": ["highway"],
+            "LT": ["highway"],
+            "LU": ["highway"],
+            "LV": ["highway"],
             "LY": ["highway"],
             "MA": ["highway"],
             "MD": ["highway"],
@@ -91,6 +124,7 @@
             "MK": ["highway"],
             "ML": ["highway"],
             "MM": ["highway"],
+            "MN": ["highway"],
             "MQ": ["highway"],
             "MR": ["highway"],
             "MS": ["highway"],
@@ -104,18 +138,33 @@
             "NI": ["highway"],
             "NL-BQ2": ["highway"],
             "NL-BQ3": ["highway"],
+            "NO": ["highway"],
             "NP": ["highway"],
+            "NZ": ["highway"],
+            "OM": ["highway"],
             "PA": ["highway"],
             "PE": ["highway"],
+            "PF": ["highway"],
+            "PG": ["highway"],
             "PH": ["highway"],
             "PK": ["highway"],
+            "PL": ["highway"],
             "PR": ["highway"],
+            "PT": ["highway"],
             "PY": ["highway"],
+            "QA": ["highway"],
             "RO": ["highway"],
             "RS": ["highway"],
+            "RS-KM": ["highway"],
+            "RU": ["highway"],
             "RW": ["highway"],
+            "SA": ["highway"],
+            "SB": ["highway"],
             "SD": ["highway"],
+            "SE": ["highway"],
             "SG": ["highway"],
+            "SI": ["highway"],
+            "SK": ["highway"],
             "SL": ["highway"],
             "SN": ["highway"],
             "SO": ["highway"],
@@ -128,25 +177,41 @@
             "TC": ["highway"],
             "TD": ["highway"],
             "TG": ["highway"],
+            "TH": ["highway"],
+            "TJ": ["highway"],
             "TL": ["highway"],
+            "TM": ["highway"],
             "TN": ["highway"],
             "TR": ["highway"],
             "TT": ["highway"],
+            "TW": ["highway"],
             "TZ": ["building", "highway"],
+            "UA": ["highway"],
             "UG": ["building", "highway"],
             "US": ["building", "highway"],
             "US-AL": ["building"],
+            "US-HI": ["building"],
             "UY": ["highway"],
+            "UZ": ["highway"],
             "VC": ["highway"],
             "VE": ["highway"],
             "VG": ["highway"],
             "VN": ["highway"],
+            "VU": ["highway"],
+            "YE": ["highway"],
             "ZA": ["highway"],
+            "ZM": ["highway"],
             "ZW": ["highway"]
         },
+        "default": true,
         "license": "ODBL",
         "osm_compatible": "yes",
+        "parameters": [{
+            "description": "buildings",
+            "enabled": true,
+            "parameter": "result_type=road_building_vector_xml"
+        }],
         "permission_url": "https://github.com/facebookmicrosites/Open-Mapping-At-Facebook/wiki/FAQ",
-        "default": true
+        "url": "https://www.mapwith.ai/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox={bbox}"
     }
 }