diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index 7e19b8388..bcbf22968 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -16,7 +16,7 @@ if (isset($plugin_list)) {
         'extension' => 'txt',
         'mime_type' => 'text/plain',
         'options' => array(
-            array('type' => 'hidden', 'name' => 'data'),
+            array('type' => 'hidden', 'name' => 'structure_or_data'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index 78fd6f235..177019412 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -20,9 +20,9 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/vnd.oasis.opendocument.spreadsheet',
         'force_file' => true,
         'options' => array(
-            array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
+            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' => 'data'),
+            array('type' => 'hidden', 'name' => 'structure_or_data'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index 157fc43d6..2b2e5c43c 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -26,32 +26,40 @@ if (isset($plugin_list)) {
         'options' => array(), /* Filled later */
         'options_text' => __('Options'),
         );
+
+    /* what to dump (structure/data/both) */
+    $plugin_list['odt']['options'][] =
+        array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', 'text' => __('Dump table')));
+    $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');
+
     /* Structure options */
     if (!$hide_structure) {
         $plugin_list['odt']['options'][] =
-            array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data');
+            array('type' => 'begin_group', 'name' => 'structure', 'text' => __('Object creation options'), 'force' => 'data');
         if (!empty($GLOBALS['cfgRelation']['relation'])) {
             $plugin_list['odt']['options'][] =
-                array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
+                array('type' => 'bool', 'name' => 'relation', 'text' => __('Display foreign key relationships'));
         }
         $plugin_list['odt']['options'][] =
-            array('type' => 'bool', 'name' => 'comments', 'text' => __('Comments'));
+            array('type' => 'bool', 'name' => 'comments', 'text' => __('Display comments'));
         if (!empty($GLOBALS['cfgRelation']['mimework'])) {
             $plugin_list['odt']['options'][] =
-                array('type' => 'bool', 'name' => 'mime', 'text' => __('MIME type'));
+                array('type' => 'bool', 'name' => 'mime', 'text' => __('Display MIME types'));
         }
         $plugin_list['odt']['options'][] =
-            array('type' => 'egroup');
+            array('type' => 'end_group');
     }
     /* Data */
     $plugin_list['odt']['options'][] =
-        array('type' => 'bgroup', 'name' => 'data', 'text' => __('Data'), 'force' => 'structure');
+        array('type' => 'begin_group', 'name' => 'data', 'text' => __('Data dump options'), 'force' => 'structure');
     $plugin_list['odt']['options'][] =
         array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row'));
     $plugin_list['odt']['options'][] =
-        array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
+        array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL with:'));
     $plugin_list['odt']['options'][] =
-        array('type' => 'egroup');
+        array('type' => 'end_group');
 } else {
 
 $GLOBALS['odt_buffer'] = '';
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index c4111e2fe..ee33c3f3f 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -21,8 +21,8 @@ if (isset($plugin_list)) {
         'force_file' => true,
         'options' => array(
             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' => 'data'),
+            array('type' => 'text', 'name' => 'report_title', 'text' => __('Report title:')),
+            array('type' => 'hidden', 'name' => 'structure_or_data'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 7d1fb5e8c..c3698cf12 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -19,7 +19,7 @@ if (isset($plugin_list)) {
         'options'       => array(
             array(
                 'type' => 'hidden',
-                'name' => 'data',
+                'name' => 'structure_or_data',
             ),
         ),
         'options_text'  => __('Options'),
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index eeb1615bf..d07bb5afc 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -18,22 +18,15 @@ if (isset($plugin_list)) {
         'extension' => 'txt',
         'mime_type' => 'text/plain',
         'options' => array(
-            array('type' => 'bool',
-                'name' => 'structure',
-                'text' => __('Structure'),
-                'force' => 'data'),
-            array('type' => 'bgroup',
-                'name' => 'data',
-                'text' => __('Data'),
-                'force' => 'structure'),
-            array('type' => 'text',
-                'name' => 'null',
-                'text' => __('Replace NULL by')),
-            array('type' => 'bool',
-                'name' => 'columns',
-                'text' => __('Put columns names in the first row')),
-            array('type' => 'egroup'),
-            ),
+        /* what to dump (structure/data/both) */
+        array('type' => 'begin_subgroup', 'subgroup_header' => array('type' => 'message_only', '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' => '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')),
+        array('type' => 'end_group'),
+        ),
         'options_text' => __('Options'),
         );
 } else {
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index d23890322..68075b152 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -20,9 +20,9 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/vnd.ms-excel',
         'force_file' => true,
         'options' => array(
-            array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
+            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' => 'data'),
+            array('type' => 'hidden', 'name' => 'structure_or_data'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index b59c78cc8..833e7e09b 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -20,9 +20,9 @@ if (isset($plugin_list)) {
         'mime_type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
         'force_file' => true,
         'options' => array(
-            array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by')),
+            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' => 'data'),
+            array('type' => 'hidden', 'name' => 'structure_or_data'),
             ),
         'options_text' => __('Options'),
         );
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index be005bfa7..d2031a22b 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -19,7 +19,7 @@ if (isset($plugin_list)) {
         'extension' => 'xml',
         'mime_type' => 'text/xml',
         'options' => array(
-            array('type' => 'hidden', 'name' => 'data'),
+            array('type' => 'hidden', 'name' => 'structure_or_data'),
             ),
         'options_text' => __('Options')
         );
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 70912725b..29055f331 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -22,7 +22,7 @@ if (isset($plugin_list)) {
         'options'       => array(
             array(
                 'type' => 'hidden',
-                'name' => 'data',
+                'name' => 'structure_or_data',
             ),
         ),
         'options_text'  => __('Options'),