diff --git a/storage/mongodb/66-mongodb.html b/storage/mongodb/66-mongodb.html
index c3dbaadc..12f904e5 100644
--- a/storage/mongodb/66-mongodb.html
+++ b/storage/mongodb/66-mongodb.html
@@ -1,6 +1,5 @@
 
-
-<script type="text/x-red" data-template-name="mongodb">
+<script type="text/html" data-template-name="mongodb">
     <div class="form-row">
         <label for="node-config-input-hostname"><i class="fa fa-bookmark"></i><span data-i18n="mongodb.label.host"></span></label>
         <input class="input-append-left" type="text" id="node-config-input-hostname" placeholder="localhost">
@@ -75,7 +74,7 @@
     });
 </script>
 
-<script type="text/x-red" data-help-name="mongodb">
+<script type="text/html" data-help-name="mongodb">
     <p>Define a connection method to your MongoDB server instance.</p>
     <p>There are 3 supported options:
         <details><summary>Standard/direct</summary>
@@ -113,7 +112,7 @@
         to the <strong>Connect options</strong>.
 </script>
 
-<script type="text/x-red" data-template-name="mongodb out">
+<script type="text/html" data-template-name="mongodb out">
     <div class="form-row">
         <label for="node-input-mongodb"><i class="fa fa-bookmark"></i> <span data-i18n="mongodb.label.server"></span></label>
         <input type="text" id="node-input-mongodb">
@@ -153,7 +152,7 @@
     <div class="form-tips" id="node-warning" style="display: none"><span data-i18n="[html]mongodb.tip"></span></div>
 </script>
 
-<script type="text/x-red" data-help-name="mongodb out">
+<script type="text/html" data-help-name="mongodb out">
     <p>A simple MongoDB output node. Can save, insert, update and remove objects from a chosen collection.</p>
     <p>Save will update an existing object or insert a new object if one does not already exist.</p>
     <p>Insert will insert a new object.</p>
@@ -175,7 +174,6 @@
 </script>
 
 <script type="text/javascript">
-
     function oneditprepare() {
         $("#node-input-operation").change(function () {
             var id = $("#node-input-operation option:selected").val();
@@ -228,7 +226,7 @@
 </script>
 
 
-<script type="text/x-red" data-template-name="mongodb in">
+<script type="text/html" data-template-name="mongodb in">
     <div class="form-row">
         <label for="node-input-mongodb"><i class="fa fa-bookmark"></i> <span data-i18n="mongodb.label.server"></span></label>
         <input type="text" id="node-input-mongodb">
@@ -252,7 +250,7 @@
     <div class="form-tips" id="node-warning" style="display: none"><span data-i18n="[html]mongodb.tip"></span></div>
 </script>
 
-<script type="text/x-red" data-help-name="mongodb in">
+<script type="text/html" data-help-name="mongodb in">
     <p>Calls a MongoDB collection method based on the selected operator.</p>
     <p>Find queries a collection using the <code>msg.payload</code> as the query statement as per the .find() function.
     Optionally, you may also (via a function) set a <code>msg.projection</code> object to constrain the returned
@@ -268,7 +266,6 @@
 </script>
 
 <script type="text/javascript">
-
     RED.nodes.registerType('mongodb in', {
         category: 'storage-input',
         color: "rgb(218, 196, 180)",
diff --git a/storage/mongodb/66-mongodb.js b/storage/mongodb/66-mongodb.js
index fadab571..2eaabb1d 100644
--- a/storage/mongodb/66-mongodb.js
+++ b/storage/mongodb/66-mongodb.js
@@ -21,25 +21,25 @@ module.exports = function(RED) {
 
         var url = "mongodb://";
         if (this.topology === "dnscluster") {
-          url = "mongodb+srv://";
+            url = "mongodb+srv://";
         }
         if (this.credentials && this.credentials.user && this.credentials.password) {
-          this.user = this.credentials.user;
-          this.password =  this.credentials.password;
+            this.user = this.credentials.user;
+            this.password =  this.credentials.password;
         } else {
-          this.user = n.user;
-          this.password = n.password;
+            this.user = n.user;
+            this.password = n.password;
         }
         if (this.user) {
-          url += this.user+":"+this.password+"@";
+            url += this.user+":"+this.password+"@";
         }
         if (clustered) {
-          url += this.hostname + "/" + this.db
+            url += this.hostname + "/" + this.db
         } else {
-          url += this.hostname + ":" + this.port + "/" + this.db;
+            url += this.hostname + ":" + this.port + "/" + this.db;
         }
         if (this.connectOptions){
-          url += "?" + this.connectOptions;
+            url += "?" + this.connectOptions;
         }
 
         console.log("MongoDB URL: " + url);
diff --git a/storage/mongodb/package.json b/storage/mongodb/package.json
index 5c1c0a99..34369e2d 100644
--- a/storage/mongodb/package.json
+++ b/storage/mongodb/package.json
@@ -1,9 +1,9 @@
 {
     "name"          : "node-red-node-mongodb",
-    "version"       : "0.1.0",
+    "version"       : "0.2.0",
     "description"   : "Node-RED nodes to talk to an Mongo database",
     "dependencies"  : {
-        "mongodb"   : "^3.6.1"
+        "mongodb"   : "^3.6.2"
     },
     "repository" : {
         "type":"git",