diff --git a/config/features.js b/config/features.js
index 7bb567d5..5eb4fb01 100644
--- a/config/features.js
+++ b/config/features.js
@@ -15,10 +15,8 @@ const venue_tags = [
   'building+name',
   'shop+name',
   'office+name',
-  'public_transport+name',
   'cuisine+name',
   'railway~station+name',
-  'railway~tram_stop+name',
   'railway~halt+name',
   'railway~subway_entrance+name',
   'railway~train_station_entrance+name',
diff --git a/package.json b/package.json
index 77b4792d..aa6128e7 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "deep-diff": "^1.0.0",
     "istanbul": "^0.4.3",
     "jshint": "^2.10.3",
+    "json-diff": "^0.5.4",
     "naivedb": "^1.0.7",
     "pelias-mock-logger": "^1.0.1",
     "precommit-hook": "^3.0.0",
diff --git a/test/config/features.js b/test/config/features.js
index be1fd936..ebf04a66 100644
--- a/test/config/features.js
+++ b/test/config/features.js
@@ -39,9 +39,7 @@ module.exports.tests.whitelist_venue_tags = function(test, common) {
     t.true( features.venue_tags.includes('building+name') );
     t.true( features.venue_tags.includes('shop+name') );
     t.true( features.venue_tags.includes('office+name') );
-    t.true( features.venue_tags.includes('public_transport+name') );
     t.true( features.venue_tags.includes('cuisine+name') );
-    t.true( features.venue_tags.includes('railway~tram_stop+name') );
     t.true( features.venue_tags.includes('railway~station+name') );
     t.true( features.venue_tags.includes('railway~halt+name') );
     t.true( features.venue_tags.includes('railway~subway_entrance+name') );
diff --git a/test/end-to-end.js b/test/end-to-end.js
index 8ce03dbc..13fe83d8 100644
--- a/test/end-to-end.js
+++ b/test/end-to-end.js
@@ -10,6 +10,7 @@ var fs = require('fs'),
     path = require('path'),
     colors = require('colors'),
     deep = require('deep-diff'),
+    jdiff = require('json-diff'),
     streams = require('../stream/importPipeline'),
     model = require('pelias-model'),
     sink = require('through2-sink'),
@@ -79,25 +80,20 @@ streams.pbfParser()
       var d = deep.diff(actual[i], expected[i]);
       if (d) {
         countDiff++;
+        console.log(jdiff.diffString(actual[i], expected[i]));
       }
       else {
         countSame++;
       }
       i++;
     }
-    var diff = deep.diff( actual, expected );
 
-    if (!diff) {
+    if (countDiff === 0) {
       fs.unlinkSync('actual_output.json');
       fs.unlinkSync('expected_output.json');
     }
 
-    if( diff ){
-      //added for clarification because understanding the deep diff output is hard
-      console.log('actual:', JSON.stringify(actual[0], null, 2));
-      console.log('expected:', JSON.stringify(expected[0], null, 2));
-
-      console.log( JSON.stringify(diff, null, 2) );
+    if (countDiff > 0){
       console.log('actual count:', actual.length);
       console.log('expected count:', expected.length);
       console.log('matching count:', colors.green(countSame));
diff --git a/test/fixtures/combined_vancouver_queens.json b/test/fixtures/combined_vancouver_queens.json
index 55887973..cc23490e 100644
--- a/test/fixtures/combined_vancouver_queens.json
+++ b/test/fixtures/combined_vancouver_queens.json
@@ -875268,34 +875268,6 @@
       "source_id": "node/2070422980"
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/2070743974",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Bellerose"
-      },
-      "phrase": {
-        "default": "Bellerose"
-      },
-      "center_point": {
-        "lon": -73.716752,
-        "lat": 40.722157
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/2070743974",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:node/2073712540",
@@ -891781,90 +891753,6 @@
       "popularity": 2000
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/3357861630",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Bellerose"
-      },
-      "phrase": {
-        "default": "Bellerose"
-      },
-      "center_point": {
-        "lon": -73.716712,
-        "lat": 40.722067
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/3357861630",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/3357907918",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.736313,
-        "lat": 40.717426
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/3357907918",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/3357907919",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.736377,
-        "lat": 40.717524
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/3357907919",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:node/3358969215",
@@ -891888,62 +891776,6 @@
       "source_id": "node/3358969215"
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/3360067112",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Hollis"
-      },
-      "phrase": {
-        "default": "Hollis"
-      },
-      "center_point": {
-        "lon": -73.766773,
-        "lat": 40.710227
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/3360067112",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/3360067113",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Hollis"
-      },
-      "phrase": {
-        "default": "Hollis"
-      },
-      "center_point": {
-        "lon": -73.766727,
-        "lat": 40.710128
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/3360067113",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:node/3360178391",
@@ -892460,30 +892292,6 @@
       "source_id": "node/3404829999"
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:node/3428101636",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Vancouver Pacific Central Station"
-      },
-      "phrase": {
-        "default": "Vancouver Pacific Central Station"
-      },
-      "center_point": {
-        "lon": -123.096332,
-        "lat": 49.273369
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "node/3428101636"
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:node/3428111195",
@@ -919624,106 +919432,6 @@
       "bounding_box": "{\"min_lat\":49.2901658,\"max_lat\":49.29132,\"min_lon\":-123.1185457,\"max_lon\":-123.1161353}"
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:relation/4600638",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Belmont"
-      },
-      "phrase": {
-        "default": "Belmont"
-      },
-      "center_point": {
-        "lon": -73.728359,
-        "lat": 40.713658
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "relation/4600638",
-      "bounding_box": "{\"min_lat\":40.7125991,\"max_lat\":40.7147609,\"min_lon\":-73.7285606,\"max_lon\":-73.7280813}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:relation/4601769",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Bellerose"
-      },
-      "phrase": {
-        "default": "Bellerose"
-      },
-      "center_point": {
-        "lon": -73.717147,
-        "lat": 40.722003
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "relation/4601769",
-      "bounding_box": "{\"min_lat\":40.7217836,\"max_lat\":40.722239,\"min_lon\":-73.7180413,\"max_lon\":-73.7162847}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:relation/4601907",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.736241,
-        "lat": 40.717584
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "relation/4601907",
-      "bounding_box": "{\"min_lat\":40.7173243,\"max_lat\":40.7178436,\"min_lon\":-73.7373096,\"max_lon\":-73.7351722}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:relation/4606374",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Hollis"
-      },
-      "phrase": {
-        "default": "Hollis"
-      },
-      "center_point": {
-        "lon": -73.766625,
-        "lat": 40.710116
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "relation/4606374",
-      "bounding_box": "{\"min_lat\":40.7099346,\"max_lat\":40.7102894,\"min_lon\":-73.7673412,\"max_lon\":-73.7659868}"
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:relation/4761998",
@@ -938082,106 +937790,6 @@
       }
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328876883",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Belmont"
-      },
-      "phrase": {
-        "default": "Belmont"
-      },
-      "center_point": {
-        "lon": -73.72819,
-        "lat": 40.713672
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328876883",
-      "bounding_box": "{\"min_lat\":40.7126365,\"max_lat\":40.7147637,\"min_lon\":-73.7283831,\"max_lon\":-73.727913}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328876884",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Belmont"
-      },
-      "phrase": {
-        "default": "Belmont"
-      },
-      "center_point": {
-        "lon": -73.728526,
-        "lat": 40.713588
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328876884",
-      "bounding_box": "{\"min_lat\":40.7125609,\"max_lat\":40.7147487,\"min_lon\":-73.7287191,\"max_lon\":-73.7282479}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328876885",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Belmont"
-      },
-      "phrase": {
-        "default": "Belmont"
-      },
-      "center_point": {
-        "lon": -73.728064,
-        "lat": 40.713947
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328876885",
-      "bounding_box": "{\"min_lat\":40.712674,\"max_lat\":40.7147762,\"min_lon\":-73.7282386,\"max_lon\":-73.7277556}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328876891",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Belmont"
-      },
-      "phrase": {
-        "default": "Belmont"
-      },
-      "center_point": {
-        "lon": -73.728359,
-        "lat": 40.713658
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328876891",
-      "bounding_box": "{\"min_lat\":40.7125991,\"max_lat\":40.7147609,\"min_lon\":-73.7285606,\"max_lon\":-73.7280813}"
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:way/328894240",
@@ -938304,35 +937912,6 @@
       "popularity": 1000
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328967577",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Bellerose"
-      },
-      "phrase": {
-        "default": "Bellerose"
-      },
-      "center_point": {
-        "lon": -73.717147,
-        "lat": 40.722003
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328967577",
-      "bounding_box": "{\"min_lat\":40.7217836,\"max_lat\":40.722239,\"min_lon\":-73.7180413,\"max_lon\":-73.7162847}",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Long Island Rail Road\"}"
-      }
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:way/328967581",
@@ -938364,156 +937943,6 @@
       }
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328972973",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.737429,
-        "lat": 40.717295
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328972973",
-      "bounding_box": "{\"min_lat\":40.7172663,\"max_lat\":40.7173243,\"min_lon\":-73.7375486,\"max_lon\":-73.7373096}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328972974",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.735388,
-        "lat": 40.71763
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328972974",
-      "bounding_box": "{\"min_lat\":40.7175829,\"max_lat\":40.7176782,\"min_lon\":-73.7355859,\"max_lon\":-73.7351895}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328972975",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.737453,
-        "lat": 40.717128
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328972975",
-      "bounding_box": "{\"min_lat\":40.7170975,\"max_lat\":40.7171587,\"min_lon\":-73.7375862,\"max_lon\":-73.7373194}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328972976",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.736241,
-        "lat": 40.717584
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328972976",
-      "bounding_box": "{\"min_lat\":40.7173243,\"max_lat\":40.7178436,\"min_lon\":-73.7373096,\"max_lon\":-73.7351722}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/328972977",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Queens Village"
-      },
-      "phrase": {
-        "default": "Queens Village"
-      },
-      "center_point": {
-        "lon": -73.736453,
-        "lat": 40.717371
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/328972977",
-      "bounding_box": "{\"min_lat\":40.7171587,\"max_lat\":40.7175829,\"min_lon\":-73.7373194,\"max_lon\":-73.7355859}"
-    }
-  },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/329177728",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "Hollis"
-      },
-      "phrase": {
-        "default": "Hollis"
-      },
-      "center_point": {
-        "lon": -73.766625,
-        "lat": 40.710116
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/329177728",
-      "bounding_box": "{\"min_lat\":40.7099346,\"max_lat\":40.7102894,\"min_lon\":-73.7673412,\"max_lon\":-73.7659868}"
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:way/329765813",
@@ -949665,35 +949094,6 @@
       }
     }
   },
-  {
-    "_index": "pelias",
-    "_id": "openstreetmap:venue:way/85214039",
-    "_type": "_doc",
-    "data": {
-      "name": {
-        "default": "West Coast Express Platform"
-      },
-      "phrase": {
-        "default": "West Coast Express Platform"
-      },
-      "center_point": {
-        "lon": -123.111411,
-        "lat": 49.285989
-      },
-      "category": [
-        "transport",
-        "transport:public"
-      ],
-      "source": "openstreetmap",
-      "layer": "venue",
-      "source_id": "way/85214039",
-      "bounding_box": "{\"min_lat\":49.2855348,\"max_lat\":49.2863964,\"min_lon\":-123.1123459,\"max_lon\":-123.1103011}",
-      "popularity": 1000,
-      "addendum": {
-        "osm": "{\"operator\":\"Trabslink\"}"
-      }
-    }
-  },
   {
     "_index": "pelias",
     "_id": "openstreetmap:venue:way/85240507",