diff --git a/package.json b/package.json
index aed14f46d2..d765539816 100644
--- a/package.json
+++ b/package.json
@@ -156,6 +156,7 @@
     "coveralls": "^2.11.13",
     "cz-conventional-changelog": "^1.2.0",
     "doctoc": "^1.0.0",
+    "escape-string-regexp": "^1.0.5 ",
     "esdoc": "^0.4.7",
     "eslint": "^2.12.0",
     "fs-extra": "^0.30.0",
diff --git a/tools/custom-esdoc-plugin.js b/tools/custom-esdoc-plugin.js
index 36fac63f32..3f4ce0c098 100644
--- a/tools/custom-esdoc-plugin.js
+++ b/tools/custom-esdoc-plugin.js
@@ -1,3 +1,4 @@
+
 function getTagValue(tag, tagName) {
   var unknownTags = tag.unknown;
   if (!unknownTags) {
@@ -47,9 +48,9 @@ exports.onHandleTag = function onHandleTag(ev) {
       delete tag.importStyle;
     }
     if (isHidden) {
-      ev.data.tag[i] = {name: '', longname: ''};
-      ev.data.tag[i]['export'] = false;
-    } else if (owner) {
+      ev.data.tag[i].builtinExternal = true;
+    }
+    if (owner && owner === 'Observable') {
       var ownerLongname = getLongname(ev, owner);
       tag.kind = 'method';
       tag.static = false;
@@ -61,4 +62,5 @@ exports.onHandleTag = function onHandleTag(ev) {
       delete tag.importStyle;
     }
   }
+  return ev;
 };