diff --git a/Common/Product/SharedProject/HierarchyNode.cs b/Common/Product/SharedProject/HierarchyNode.cs
index 95cc335ca..414337d31 100644
--- a/Common/Product/SharedProject/HierarchyNode.cs
+++ b/Common/Product/SharedProject/HierarchyNode.cs
@@ -929,9 +929,8 @@ public virtual void Remove(bool removeFromStorage) {
 
             RaiseOnItemRemoved(documentToRemove, filesToBeDeleted);
 
-            // When we don't call this it behaves properly also in Solution Explorer search result set
             // Notify hierarchy event listeners that items have been invalidated
-            //ProjectMgr.OnInvalidateItems(this);
+            ProjectMgr.OnInvalidateItems(this);
 
             // Dispose the node now that is deleted.
             this.Dispose(true);
@@ -996,8 +995,12 @@ internal void RemoveNonDocument(bool removeFromStorage) {
             ProjectMgr.OnItemDeleted(this);
 
             // Remove child if any before removing from the hierarchy
-            for (HierarchyNode child = this.FirstChild; child != null; child = child.NextSibling) {
+            HierarchyNode child = this.FirstChild;
+            while (child != null) {
+                // Need to read NextSibling before calling Remove
+                var next = child.NextSibling;
                 child.Remove(removeFromStorage);
+                child = next;
             }
 
             // the project node has no parentNode
diff --git a/Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest b/Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest
index 1e76be19f..c33526804 100644
--- a/Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest
+++ b/Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest
@@ -1,6 +1,6 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="1.3.0.3" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="1.3.0.4" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Node.js Tools - Interactive Window</DisplayName>
     <Description xml:space="preserve">Node.js Tools - Interactive Window.</Description>
     <MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
diff --git a/Nodejs/Product/Nodejs/source.extension.vsixmanifest b/Nodejs/Product/Nodejs/source.extension.vsixmanifest
index ae613ec06..3524ca282 100644
--- a/Nodejs/Product/Nodejs/source.extension.vsixmanifest
+++ b/Nodejs/Product/Nodejs/source.extension.vsixmanifest
@@ -1,6 +1,6 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="1.3.0.3" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="FE8A8C3D-328A-476D-99F9-2A24B75F8C7F" Version="1.3.0.4" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Node.js Tools</DisplayName>
     <Description xml:space="preserve">Provides support for editing and debugging Node.js programs.</Description>
     <MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
diff --git a/Nodejs/Product/Profiling/source.extension.vsixmanifest b/Nodejs/Product/Profiling/source.extension.vsixmanifest
index 5220b3627..21711873e 100644
--- a/Nodejs/Product/Profiling/source.extension.vsixmanifest
+++ b/Nodejs/Product/Profiling/source.extension.vsixmanifest
@@ -1,6 +1,6 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="B515653F-FB69-4B64-9D3F-F1FCF8421DD0" Version="1.3.0.3" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="B515653F-FB69-4B64-9D3F-F1FCF8421DD0" Version="1.3.0.4" Language="en-US" Publisher="Microsoft" />
     <DisplayName>Node.js Tools - Profiling</DisplayName>
     <Description xml:space="preserve">Provides support for profiling Node.js projects</Description>
     <MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>