diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index 9c829c007..52f8577dd 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -33,8 +33,10 @@ if (isset($plugin_list)) {
         'extension' => 'cs',
         'mime_type' => 'text/cs',
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
             array('type' => 'select', 'name' => 'format', 'text' => __('Format:'), 'values' => $CG_FORMATS),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index dfe9885ad..39defdcb4 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -18,6 +18,7 @@ if (isset($plugin_list)) {
         'extension' => 'csv',
         'mime_type' => 'text/comma-separated-values',
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'text', 'name' => 'separator', 'text' => __('Columns terminated with:')),
             array('type' => 'text', 'name' => 'enclosed', 'text' => __('Columns enclosed with:')),
             array('type' => 'text', 'name' => 'escaped', 'text' => __('Columns escaped with:')),
@@ -26,6 +27,7 @@ if (isset($plugin_list)) {
             array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove carriage return/line field characters within columns')),
             array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/excel.php b/libraries/export/excel.php
index 68d2b5c8c..1e1ab2f55 100644
--- a/libraries/export/excel.php
+++ b/libraries/export/excel.php
@@ -19,6 +19,7 @@ if (isset($plugin_list)) {
         'extension' => 'csv',
         'mime_type' => 'text/comma-separated-values',
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')),
             array('type' => 'bool', 'name' => 'removeCRLF', 'text' => __('Remove carriage return/line feed characters within columns')),
             array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')),
@@ -31,6 +32,7 @@ if (isset($plugin_list)) {
                     'mac_excel2008' => 'Excel 2008 / Macintosh'), 
                 'text' => __('Excel edition:')),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 7b8595bd6..3d534cdef 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -21,9 +21,9 @@ if (isset($plugin_list)) {
         'force_file' => true,
         'options' => array(
             /* what to dump (structure/data/both) */
-            array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Dump table'))),
+            array('type' => 'begin_group', 'name' => 'dump_what', 'text' => __('Dump table')),
             array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))),
-            array('type' => 'end_subgroup'),
+            array('type' => 'end_group'),
             /* data options */
             array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'),
             array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')),
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 4f8578858..61a933b64 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -23,17 +23,19 @@ if (isset($plugin_list)) {
         'extension' => 'tex',
         'mime_type' => 'application/x-tex',
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'bool', 'name' => 'caption', 'text' => __('Include table caption')),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options'),
         );
 
     /* what to dump (structure/data/both) */
     $plugin_list['latex']['options'][] =
-        array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Dump table')));
+        array('type' => 'begin_group', 'name' => 'dump_what', 'text' => __('Dump table'));
     $plugin_list['latex']['options'][] =
         array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')));
-    $plugin_list['latex']['options'][] = array('type' => 'end_subgroup');
+    $plugin_list['latex']['options'][] = array('type' => 'end_group');
 
     /* Structure options */
     if (!$hide_structure) {
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index bcbf22968..9fa1b483e 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -16,7 +16,9 @@ if (isset($plugin_list)) {
         'extension' => 'txt',
         'mime_type' => 'text/plain',
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 177019412..5b70944dd 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -20,9 +20,11 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/vnd.oasis.opendocument.spreadsheet',
         'force_file' => true,
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')),
             array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index 2b2e5c43c..b5d500d30 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -29,10 +29,10 @@ if (isset($plugin_list)) {
 
     /* what to dump (structure/data/both) */
     $plugin_list['odt']['options'][] =
-        array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Dump table')));
+        array('type' => 'begin_group', 'text' => __('Dump table') , 'name' => 'general_opts');
     $plugin_list['odt']['options'][] =
         array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')));
-    $plugin_list['odt']['options'][] = array('type' => 'end_subgroup');
+    $plugin_list['odt']['options'][] = array('type' => 'end_group');
 
     /* Structure options */
     if (!$hide_structure) {
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index ee33c3f3f..2f544b551 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -20,9 +20,11 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/pdf',
         'force_file' => true,
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'message_only', 'name' => 'explanation', 'text' => __('(Generates a report containing the data of a single table)')),
             array('type' => 'text', 'name' => 'report_title', 'text' => __('Report title:')),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index c3698cf12..5cf6fb760 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -17,10 +17,12 @@ if (isset($plugin_list)) {
         'extension'     => 'php',
         'mime_type'     => 'text/plain',
         'options'       => array(
+        array('type' => 'begin_group', 'name' => 'general_opts'),
             array(
                 'type' => 'hidden',
                 'name' => 'structure_or_data',
             ),
+        array('type' => 'end_group')
         ),
         'options_text'  => __('Options'),
     );
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 354fac70a..aee3313d9 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -27,6 +27,8 @@ if (isset($plugin_list)) {
             'mime_type' => 'text/x-sql',
             'options' => array());
 
+        $plugin_list['sql']['options'][] = array('type' => 'begin_group', 'name' => 'general_opts');
+
         /* comments */
         $plugin_list['sql']['options'][] =
             array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'bool', 'name' => 'include_comments', 'text' => __('Display comments <i>(includes info such as export timestamp, PHP version, and server version)</i>')));
@@ -78,6 +80,8 @@ if (isset($plugin_list)) {
             array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data')));
         $plugin_list['sql']['options'][] = array('type' => 'end_subgroup');
 
+        $plugin_list['sql']['options'][] = array('type' => 'end_group');
+        
         /* begin Structure options */
          if (!$hide_structure) {
             $plugin_list['sql']['options'][] =
@@ -148,10 +152,10 @@ if (isset($plugin_list)) {
             array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Syntax to use when inserting data:')));
         $plugin_list['sql']['options'][] =
             array('type' => 'radio', 'name' => 'insert_syntax', 'values' => array(
-                'complete' => __('include column names in every <code>INSERT</code> statement <br> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>'), 
-                'extended' => __('insert multiple rows in every <code>INSERT</code> statement<br> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>'), 
-                'both' => __('both of the above<br> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>'), 
-                'none' => __('neither of the above<br> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3)</code>')));  
+                'complete' => __('include column names in every <code>INSERT</code> statement <br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)</code>'), 
+                'extended' => __('insert multiple rows in every <code>INSERT</code> statement<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)</code>'), 
+                'both' => __('both of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>'), 
+                'none' => __('neither of the above<br /> &nbsp; &nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3)</code>')));  
           $plugin_list['sql']['options'][] =
             array('type' => 'end_subgroup');
 
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index d07bb5afc..8ed6a742a 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -19,9 +19,9 @@ if (isset($plugin_list)) {
         'mime_type' => 'text/plain',
         'options' => array(
         /* what to dump (structure/data/both) */
-        array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Dump table'))),
+        array('type' => 'begin_group', 'text' => __('Dump table'), 'name' => 'general_opts'),
         array('type' => 'radio', 'name' => 'structure_or_data', 'values' => array('structure' => __('structure'), 'data' => __('data'), 'structure_and_data' => __('structure and data'))),
-        array('type' => 'end_subgroup'),
+        array('type' => 'end_group'),
         array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure'),
         array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
         array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')),
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 68075b152..188667798 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -20,9 +20,11 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/vnd.ms-excel',
         'force_file' => true,
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')),
             array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index 833e7e09b..a5459579b 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -20,9 +20,11 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
         'force_file' => true,
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:')),
             array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row')),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index b6da9c4d8..4f6f97813 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -19,14 +19,18 @@ if (isset($plugin_list)) {
         'extension' => 'xml',
         'mime_type' => 'text/xml',
         'options' => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array('type' => 'hidden', 'name' => 'structure_or_data'),
+            array('type' => 'end_group')
             ),
         'options_text' => __('Options')
         );
     
     /* Export structure */
     $plugin_list['xml']['options'][] =
-        array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'name' => 'export_struc', 'text' => __('Structure schemas to export (all are recommended):')));
+        array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'));
+    $plugin_list['xml']['options'][] =
+        array('type' => 'begin_subgroup', 'name' => 'export_struc', 'text' => __('Structure schemas to export (all are recommended):'));
     $plugin_list['xml']['options'][] =
         array('type' => 'bool', 'name' => 'export_functions', 'text' => __('Functions'));
     $plugin_list['xml']['options'][] =
@@ -37,12 +41,15 @@ if (isset($plugin_list)) {
         array('type' => 'bool', 'name' => 'export_triggers', 'text' => __('Triggers'));
     $plugin_list['xml']['options'][] =
         array('type' => 'bool', 'name' => 'export_views', 'text' => __('Views'));
-    $plugin_list['xml']['options'][] =
-        array('type' => 'end_subgroup');
+    $plugin_list['xml']['options'][] = array('type' => 'end_subgroup');
+    $plugin_list['xml']['options'][] = array('type' => 'end_group');
     
     /* Data */
+    $plugin_list['xml']['options'][] =
+        array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'));
     $plugin_list['xml']['options'][] =
         array('type' => 'bool', 'name' => 'export_contents', 'text' => __('Export contents'));
+    $plugin_list['xml']['options'][] = array('type' => 'end_group');
 } else {
 
 /**
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 29055f331..9fce67f83 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -20,10 +20,12 @@ if (isset($plugin_list)) {
         'mime_type'     => 'text/yaml',
         'force_file'    => true,
         'options'       => array(
+            array('type' => 'begin_group', 'name' => 'general_opts'),
             array(
                 'type' => 'hidden',
                 'name' => 'structure_or_data',
             ),
+            array('type' => 'end_group')
         ),
         'options_text'  => __('Options'),
     );