diff --git a/editor/js/main.js b/editor/js/main.js
index 79fff2996..436e3611f 100644
--- a/editor/js/main.js
+++ b/editor/js/main.js
@@ -179,13 +179,13 @@ var RED = (function() {
             {id:"menu-item-view-snap-grid",label:RED._("menu.label.view.snapGrid"),toggle:true,onselect:RED.view.toggleSnapGrid},
             {id:"menu-item-status",label:RED._("menu.label.displayStatus"),toggle:true,onselect:toggleStatus, selected: true},
             null,
-            {id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
-                {id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if(s){RED.text.bidi.setTextDirection("")}}},
-                {id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("ltr")}}},
-                {id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("rtl")}}},
-                {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
-            ]},
-            null,
+            // {id:"menu-item-bidi",label:RED._("menu.label.view.textDir"),options:[
+            //     {id:"menu-item-bidi-default",toggle:"text-direction",label:RED._("menu.label.view.defaultDir"),selected: true, onselect:function(s) { if(s){RED.text.bidi.setTextDirection("")}}},
+            //     {id:"menu-item-bidi-ltr",toggle:"text-direction",label:RED._("menu.label.view.ltr"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("ltr")}}},
+            //     {id:"menu-item-bidi-rtl",toggle:"text-direction",label:RED._("menu.label.view.rtl"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("rtl")}}},
+            //     {id:"menu-item-bidi-auto",toggle:"text-direction",label:RED._("menu.label.view.auto"), onselect:function(s) { if(s){RED.text.bidi.setTextDirection("auto")}}}
+            // ]},
+            // null,
             {id:"menu-item-sidebar",label:RED._("menu.label.sidebar.show"),toggle:true,onselect:RED.sidebar.toggleSidebar, selected: true}
         ]});
         menuOptions.push(null);
diff --git a/nodes/core/io/21-httpin.html b/nodes/core/io/21-httpin.html
index 84b0f39cf..fc74dc291 100644
--- a/nodes/core/io/21-httpin.html
+++ b/nodes/core/io/21-httpin.html
@@ -27,7 +27,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-url"><i class="fa fa-globe"></i> <span data-i18n="httpin.label.url"></span></label>
-        <div id="node-input-url" contenteditable="true" placeholder="/url"></div>
+        <input id="node-input-url" type="text" placeholder="/url">
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -117,7 +117,7 @@ msg.cookies = {
         color:"rgb(231, 231, 174)",
         defaults: {
             name: {value:""},
-            url: {value:"",required:true,format:"url"},
+            url: {value:"",required:true},
             method: {value:"get",required:true},
             swaggerDoc: {type:"swagger-doc", required:false}
         },
diff --git a/nodes/core/io/21-httprequest.html b/nodes/core/io/21-httprequest.html
index 9485f8da7..19d5f5a2a 100644
--- a/nodes/core/io/21-httprequest.html
+++ b/nodes/core/io/21-httprequest.html
@@ -27,7 +27,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-url"><i class="fa fa-globe"></i> <span data-i18n="httpin.label.url"></span></label>
-        <div id="node-input-url" contenteditable="true" placeholder="http://"></div>
+        <input id="node-input-url" type="text" placeholder="http://">
     </div>
 
     <div class="form-row">
@@ -102,7 +102,7 @@
             name: {value:""},
             method:{value:"GET"},
             ret: {value:"txt"},
-            url:{value:"",format:"url"},
+            url:{value:""},
             tls: {type:"tls-config",required: false}
         },
         credentials: {
diff --git a/nodes/core/io/22-websocket.html b/nodes/core/io/22-websocket.html
index ca74898f7..1bdbb4e41 100644
--- a/nodes/core/io/22-websocket.html
+++ b/nodes/core/io/22-websocket.html
@@ -145,7 +145,7 @@
     RED.nodes.registerType('websocket-listener',{
         category: 'config',
         defaults: {
-            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/),format:"filepath" },
+            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/)},
             wholemsg: {value:"false"}
         },
         inputs:0,
@@ -179,7 +179,7 @@
     RED.nodes.registerType('websocket-client',{
         category: 'config',
         defaults: {
-            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/),format:"filepath" },
+            path: {value:"",required:true,validate:RED.validators.regex(/^((?!\/debug\/ws).)*$/)},
             wholemsg: {value:"false"}
         },
         inputs:0,
@@ -232,7 +232,7 @@
 <script type="text/x-red" data-template-name="websocket-listener">
     <div class="form-row">
         <label for="node-config-input-path"><i class="fa fa-bookmark"></i> <span data-i18n="websocket.label.path"></span></label>
-        <div id="node-config-input-path" contenteditable="true" placeholder="/ws/example"></div>
+        <input id="node-config-input-path" type="text" placeholder="/ws/example">
     </div>
     <div class="form-row">
         <label for="node-config-input-wholemsg">&nbsp;</label>
@@ -255,7 +255,7 @@
 <script type="text/x-red" data-template-name="websocket-client">
     <div class="form-row">
         <label for="node-config-input-path"><i class="fa fa-bookmark"></i> <span data-i18n="websocket.label.url"></span></label>
-        <div id="node-config-input-path" contenteditable="true" placeholder="ws://example.com/ws"></div>
+        <input id="node-config-input-path" type="text" placeholder="ws://example.com/ws">
     </div>
     <div class="form-row">
         <label for="node-config-input-wholemsg">&nbsp;</label>
diff --git a/nodes/core/io/23-watch.html b/nodes/core/io/23-watch.html
index 90149fdfe..e165aa551 100644
--- a/nodes/core/io/23-watch.html
+++ b/nodes/core/io/23-watch.html
@@ -17,7 +17,7 @@
 <script type="text/x-red" data-template-name="watch">
     <div class="form-row node-input-filename">
          <label for="node-input-files"><i class="fa fa-file"></i> <span data-i18n="watch.label.files"></span></label>
-         <div id="node-input-files" contenteditable="true" tabindex="1" data-i18n="[placeholder]watch.placeholder.files"></div>
+         <input id="node-input-files" type="text" tabindex="1" data-i18n="[placeholder]watch.placeholder.files">
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -46,7 +46,7 @@
         category: 'advanced-input',
         defaults: {
             name: {value:""},
-            files: {value:"",required:true, format:"filepath"}
+            files: {value:"",required:true}
         },
         color:"BurlyWood",
         inputs:0,
diff --git a/nodes/core/storage/28-tail.html b/nodes/core/storage/28-tail.html
index f8aa1ee0d..65780243d 100644
--- a/nodes/core/storage/28-tail.html
+++ b/nodes/core/storage/28-tail.html
@@ -17,7 +17,7 @@
 <script type="text/x-red" data-template-name="tail">
     <div class="form-row">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="tail.label.filename"></span></label>
-         <div id="node-input-filename" contenteditable="true"></div>
+         <input id="node-input-filename" type="text">
     </div>
     <div class="form-row">
         <label for="node-input-filetype"><i class="fa fa-file-text-o"></i> <span data-i18n="tail.label.type"></span></label>
@@ -50,7 +50,7 @@
             name: {value:""},
             filetype: {value:"text"},
             split: {value:false},
-            filename: {value:"",required:true,format:"filepath"}
+            filename: {value:"",required:true}
         },
         color:"BurlyWood",
         inputs:0,
diff --git a/nodes/core/storage/50-file.html b/nodes/core/storage/50-file.html
index 39cd822a8..656bfaede 100644
--- a/nodes/core/storage/50-file.html
+++ b/nodes/core/storage/50-file.html
@@ -17,7 +17,7 @@
 <script type="text/x-red" data-template-name="file">
     <div class="form-row node-input-filename">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
-         <div id="node-input-filename" contenteditable="true"></div>
+         <input id="node-input-filename" type="text">
     </div>
     <div class="form-row">
         <label for="node-input-overwriteFile"><i class="fa fa-random"></i> <span data-i18n="file.label.action"></span></label>
@@ -56,7 +56,7 @@
 <script type="text/x-red" data-template-name="file in">
     <div class="form-row">
          <label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
-         <div id="node-input-filename" contenteditable="true" data-i18n="[placeholder]file.label.filename"></div>
+         <input id="node-input-filename" type="text" data-i18n="[placeholder]file.label.filename">
     </div>
     <div class="form-row">
         <label for="node-input-format"><i class="fa fa-sign-out"></i> <span data-i18n="file.label.outputas"></span></label>
@@ -83,7 +83,7 @@
         category: 'storage-output',
         defaults: {
             name: {value:""},
-            filename: {value:"",format:"filepath"},
+            filename: {value:""},
             appendNewline: {value:true},
             createDir: {value:false},
             overwriteFile: {value:"false"}
@@ -115,7 +115,7 @@
         category: 'storage-input',
         defaults: {
             name: {value:""},
-            filename: {value:"",format:"filepath"},
+            filename: {value:""},
             format: {value:"utf8"},
         },
         color:"BurlyWood",