diff --git a/tool/dsviewer/dsviewer.cpp b/tool/dsviewer/dsviewer.cpp
index 165ae32..35eeada 100644
--- a/tool/dsviewer/dsviewer.cpp
+++ b/tool/dsviewer/dsviewer.cpp
@@ -275,23 +275,22 @@ void tail(const std::vector<std::string> &cmd_units)
 
 void set_enable(const std::vector<std::string> &cmd_units)
 {
-    // enable column|row <column> <column>...
-    if (cmd_units.size() < 3) throw std::runtime_error("enable: insufficient parameters.");
+    // enable table|column|row [<name1>,<name2>...]
+    if (cmd_units.size() < 2) throw std::runtime_error("enable: insufficient parameters.");
 
-    if (cmd_units[1] == "column")
+    if (cmd_units[1] == "table") tc.table_output(Enable);
+    else if (cmd_units[1] == "column")
     {
         for (size_t i = 2; i < cmd_units.size(); i++)
         {
-            if (tc.name_index(cmd_units[i]) < 0) tc.column_output(atoi(cmd_units[i].c_str()), Enable);
-            else tc.column_output(cmd_units[i], Enable);
+            tc.column_output(cmd_units[i], Enable);
         }
     }
     else if (cmd_units[1] == "row")
     {
         for (size_t i = 2; i < cmd_units.size(); i++)
         {
-            if (tc.name_index(cmd_units[i], true) < 0) tc.row_output(atoi(cmd_units[i].c_str()), Enable);
-            else tc.row_output(cmd_units[i], Enable);
+            tc.row_output(cmd_units[i], Enable);
         }
     }
     else throw std::runtime_error("enable: invalid parameters.");
@@ -300,23 +299,22 @@ void set_enable(const std::vector<std::string> &cmd_units)
 
 void set_disable(const std::vector<std::string> &cmd_units)
 {
-    // disable column|row <column> <column>...
-    if (cmd_units.size() < 3) throw std::runtime_error("disable: insufficient parameters.");
+    // disable table|column|row [<name1>,<name2>...]
+    if (cmd_units.size() < 2) throw std::runtime_error("disable: insufficient parameters.");
 
-    if (cmd_units[1] == "column")
+    if (cmd_units[1] == "table") tc.table_output(Disable);
+    else if (cmd_units[1] == "column")
     {
         for (size_t i = 2; i < cmd_units.size(); i++)
         {
-            if (tc.name_index(cmd_units[i]) < 0) tc.column_output(atoi(cmd_units[i].c_str()), Disable);
-            else tc.column_output(cmd_units[i], Enable);
+            tc.column_output(cmd_units[i], Disable);
         }
     }
     else if (cmd_units[1] == "row")
     {
         for (size_t i = 2; i < cmd_units.size(); i++)
         {
-            if (tc.name_index(cmd_units[i], true) < 0) tc.row_output(atoi(cmd_units[i].c_str()), Disable);
-            else tc.row_output(cmd_units[i], Enable);
+            tc.row_output(cmd_units[i], Disable);
         }
     }
     else throw std::runtime_error("disable: invalid parameters.");
diff --git a/tool/dsviewer/dsviewer.md b/tool/dsviewer/dsviewer.md
index 137973d..30b8953 100644
--- a/tool/dsviewer/dsviewer.md
+++ b/tool/dsviewer/dsviewer.md
@@ -19,10 +19,10 @@ Save table to a dsv/csv file. The default setups are space for delimeter, '#' fo
 #### stats \<colname1\> \<colname2\> ...
 Show statistics of a data column or columns. If the input file has no column names, use inbuild names `C<id>` to select the columns.
 
-#### enable column|row \<name1\> \<name2\> ...
+#### enable table|column|row [\<name1\> \<name2\> ...]
 Enable table outputs. If the input file has no row or column names, use inbuild names `R<id>` and `C<id>` to select the rows and columns. 
 
-#### disable column|row \<name1\> \<name2\> ...
+#### disable table|column|row [\<name1\> \<name2\> ...]
 Disable table outputs. If the input file has no row or column names, use inbuild names `R<id>` and `C<id>` to select the rows and columns.
 
 #### insert row|col [\<new-name\>] [\<insert-name\>]