diff --git a/modules/services/osm.js b/modules/services/osm.js
index 082a84ea5..0331bba51 100644
--- a/modules/services/osm.js
+++ b/modules/services/osm.js
@@ -597,7 +597,7 @@ export default {
                     if (err) {
                         return callback(err);
                     } else {
-                        return parseXML(payload, callback, options);
+                        return parseJSON(payload, callback, options);
                     }
                 }
             }
@@ -608,7 +608,7 @@ export default {
         } else {
             var url = urlroot + path;
             var controller = new AbortController();
-            d3_xml(url, { signal: controller.signal })
+            d3_json(url, { signal: controller.signal })
                 .then(function(data) {
                     done(null, data);
                 })
@@ -638,7 +638,7 @@ export default {
         var options = { skipSeen: false };
 
         this.loadFromAPI(
-            '/api/0.6/' + type + '/' + osmID + (type !== 'node' ? '/full' : ''),
+            '/api/0.6/' + type + '/' + osmID + (type !== 'node' ? '/full' : '') + '.json',
             function(err, entities) {
                 if (callback) callback(err, { data: entities });
             },
@@ -655,7 +655,7 @@ export default {
         var options = { skipSeen: false };
 
         this.loadFromAPI(
-            '/api/0.6/' + type + '/' + osmID + '/' + version,
+            '/api/0.6/' + type + '/' + osmID + '/' + version + '.json',
             function(err, entities) {
                 if (callback) callback(err, { data: entities });
             },
@@ -679,7 +679,7 @@ export default {
 
             utilArrayChunk(osmIDs, 150).forEach(function(arr) {
                 that.loadFromAPI(
-                    '/api/0.6/' + type + '?' + type + '=' + arr.join(),
+                    '/api/0.6/' + type + '.json?' + type + '=' + arr.join(),
                     function(err, entities) {
                         if (callback) callback(err, { data: entities });
                     },
@@ -986,7 +986,7 @@ export default {
             dispatch.call('loading');   // start the spinner
         }
 
-        var path = '/api/0.6/map?bbox=';
+        var path = '/api/0.6/map.json?bbox=';
         var options = { skipSeen: true };
 
         _tileCache.inflight[tile.id] = this.loadFromAPI(