diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
index 58c282f..ba09d6c 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
@@ -98,6 +98,10 @@
         OutputFormat format;
         boolean csvAndHeader = false;
         String output = request.getParameter("output-format");
+        if ("CSV-Header".equals(output)) {
+            output = "CSV";
+            csvAndHeader = true;
+        }
         try {
             format = OutputFormat.valueOf(output);
         } catch (IllegalArgumentException e) {
diff --git a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
index cffec6f..383754e 100644
--- a/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterixdb/asterix-app/src/main/resources/webui/querytemplate.html
@@ -72,6 +72,18 @@
         }
     });
 
+    $('#output-format').on('change', function() {
+      var resultFormat = $('#output-format option:checked').text();
+      if (resultFormat == 'JSON (formatted)' || resultFormat == 'CSV (no header)' || resultFormat == 'CSV (with header)') {
+        $('input[name=wrapper-array]').attr('disabled', true);
+        $('input[name=wrapper-array]').prop('checked', false);
+        $('input[name=wrapper-array]').parent().css('color', 'grey');
+      } else {
+        $('input[name=wrapper-array]').attr("disabled", false);
+        $('input[name=wrapper-array]').parent().css('color', '');
+      }
+    });
+
     $("form#queryform").submit(function() {
         $('#output-message').html("");
         $.post("/", $("form#queryform").serialize(), function(data) {