diff --git a/services/discovery/discovery-utils.js b/services/discovery/discovery-utils.js
index 2e491ac0..120f1309 100644
--- a/services/discovery/discovery-utils.js
+++ b/services/discovery/discovery-utils.js
@@ -124,7 +124,7 @@ DiscoveryUtils.prototype = {
       params.query = config.querynlp;
       params.nlp_query = config.nlp_query;
     } else {
-      params = buildStructuredQuery(msg, config, params);
+      params = this.buildStructuredQuery(msg, config, params);
     }
     return params;
   },
diff --git a/services/discovery/v1-query-builder.html b/services/discovery/v1-query-builder.html
index da2d19d7..8fd8b482 100644
--- a/services/discovery/v1-query-builder.html
+++ b/services/discovery/v1-query-builder.html
@@ -243,7 +243,7 @@
       });
 
       $('input#node-input-nlp_query').change(function () {
-          var checked = $('input#node-input-nlp_query').prop('checked')
+          var checked = $('input#node-input-nlp_query').prop('checked');
           if (checked) {
             $('#node-input-querynlp').parent().show();
             $('#node-input-query1').parent().hide();
@@ -413,9 +413,12 @@
     // three query switch lists can be shown.
     disQB.showSchemas = function () {
       if (disQB.schemas && disQB.schemaCheck()) {
-        $('select#node-input-query1').parent().show();
-        $('select#node-input-query2').parent().show();
-        $('select#node-input-query3').parent().show();
+        var checked = $('input#node-input-nlp_query').prop('checked');
+        if (!checked) {
+          $('select#node-input-query1').parent().show();
+          $('select#node-input-query2').parent().show();
+          $('select#node-input-query3').parent().show();
+        }
         disQB.populateSchemas();
       }
     }
diff --git a/services/language_translator_identify/v2.html b/services/language_translator_identify/v2.html
index a32693b7..c03aaabe 100644
--- a/services/language_translator_identify/v2.html
+++ b/services/language_translator_identify/v2.html
@@ -46,7 +46,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="watson-language-translator-identify">
-    <p>Packaged in with release 0.5.9 of node-red-node-watson</p>
+    <p>Packaged in with release 0.5.11 of node-red-node-watson</p>
     <p>The Watson Language Translator service can be used to identify languages used in a text input. <p>
     <p>Node input : </p>
     <ul>