diff --git a/lute/book/datatables.py b/lute/book/datatables.py
index 2d22a047..a4b799f1 100644
--- a/lute/book/datatables.py
+++ b/lute/book/datatables.py
@@ -70,7 +70,6 @@ def get_data_tables_list(parameters, is_archived):
     if language_id != 0:
         base_sql += f" and LgID = {language_id}"
 
-    # print(base_sql)
     session = db.session
     connection = session.connection()
 
diff --git a/lute/book/routes.py b/lute/book/routes.py
index fbcec850..c1506ca7 100644
--- a/lute/book/routes.py
+++ b/lute/book/routes.py
@@ -39,6 +39,10 @@ def _load_term_custom_filters(request_form, parameters):
 
 def datatables_source(is_archived):
     "Get datatables json for books."
+    # In the future, we might want to create an API such as
+    # get_books(sort_order, search_string, length, index, language_id).
+    # See DataTablesFlaskParamParser.parse_params_2(request.form)
+    # (currently unused)
     parameters = DataTablesFlaskParamParser.parse_params(request.form)
     _load_term_custom_filters(request.form, parameters)
     data = get_data_tables_list(parameters, is_archived)
diff --git a/lute/bookmarks/datatables.py b/lute/bookmarks/datatables.py
index e1a24766..f70c8fcc 100644
--- a/lute/bookmarks/datatables.py
+++ b/lute/bookmarks/datatables.py
@@ -10,7 +10,7 @@ def get_data_tables_list(parameters, book_id):
     "Bookmark json data for datatables."
 
     base_sql = f"""
-      SELECT tb.TbID, tb.TbTxID, tb.TbTitle, tx.TxText, tx.TxOrder
+      SELECT tb.TbID, tb.TbTxID, tb.TbTitle, tx.TxOrder
       FROM textbookmarks as tb
       INNER JOIN texts as tx ON tb.TbTxID = tx.TxID
       WHERE tx.TxBkID = { book_id }
diff --git a/lute/templates/book/tablelisting.html b/lute/templates/book/tablelisting.html
index 47573e3c..3262798f 100644
--- a/lute/templates/book/tablelisting.html
+++ b/lute/templates/book/tablelisting.html
@@ -68,8 +68,7 @@
       },
       buttons: [
         {
-          extend: 'colvis',
-          columns: '.colVisToggled'
+          extend: 'colvis'
         }
       ],
       {% if status != 'Archived' %}
@@ -89,24 +88,15 @@
       stateSave: true,
       stateDuration: 0,  /* never expire saved state. */
       search: { search: initial_search },
-      columnDefs: [
-        { "name": "BkTitle", "targets": 0, "width": "40%", "render": render_book_title, className: "colVisToggled" },
-        { "name": "LgName", "targets": 1, "width": "10%", className: "colVisToggled" },
-        { "name": "TagList", "targets": 2, "width": "10%", className: "colVisToggled" },
-        { "name": "WordCount", "targets": 3, "width": "10%", className: "colVisToggled" },
-        { "name": "UnknownPercent", "targets": 4, "data": null, "searchable": true, "orderable": true, "render": render_book_stats_graph, className: "colVisToggled" },
-        { "targets": 5, "data": null, "width": "8%", "searchable": false, "orderable": false, "render": render_book_actions, className: "colVisToggled" },
-
-        /* Extra data that is returned in the row for rendering, but not shown, not changed by colvis. */
-        { "name": "BkID", "targets": 6, "data": null, "visible": false },
-        { "name": "BkArchived", "targets": 7, "data": null, "visible": false },
-        { "name": "PageCount", "targets": 8, "data": null, "visible": false },
-        { "name": "PageNum", "targets": 9, "data": null, "visible": false },
-        { "name": "IsCompleted", "targets": 10, "data": null, "visible": false },
-        { "name": "StatusDistribution", "targets": 11, "data": null, "visible": false },
+      columns: [
+        { name: "BkTitle", width: "40%", render: render_book_title },
+        { name: "LgName", width: "10%", data: "LgName" },
+        { name: "TagList", width: "10%", data: "TagList" },
+        { name: "WordCount", width: "10%", data: "WordCount" },
+        { name: "UnknownPercent", render: render_book_stats_graph },
+        { width: "8%", "searchable": false, "orderable": false, render: render_book_actions },
       ],
 
-      // Ajax call
       ajax: {
         url: "/book/datatables/{{ status or 'active' }}",
         // Additional filters.  func calls are required to get the
@@ -121,9 +111,6 @@
       },
 
     });
-
-    // var dropdown = $('#defaultLanguageSelect');
-    // $('div.toolbar').append(dropdown);
   } // end setup_book_datatable
 
 
@@ -209,13 +196,16 @@
     do_action_post('delete', bookid);
   }
 
+  // Rendering helpers. =================================================
+  // each row in the table is a json dict, the keys are the SQL column names.
+
   let render_book_title = function ( data, type, row, meta ) {
-    const bkid = parseInt(row[5]);
-    const pgnum = parseInt(row[8]);
-    const pgcount = parseInt(row[7]);
+    const bkid = parseInt(row['BkID']);
+    const pgnum = parseInt(row['PageNum']);
+    const pgcount = parseInt(row['PageCount']);
     let pgfraction = '';
 
-    const completed = (parseInt(row[9]) == 1);
+    const completed = (parseInt(row['IsCompleted']) == 1);
     let book_title_classes = ['book-title'];
     if (completed) {
       book_title_classes.push('completed_book');
@@ -224,13 +214,13 @@
       pgfraction = ` (${pgnum}/${pgcount})`;
     }
 
-    return `<a class="${book_title_classes.join(' ')}" href="/read/${bkid}">${row[0]}${pgfraction}</a>`;
+    return `<a class="${book_title_classes.join(' ')}" href="/read/${bkid}">${row['BkTitle']}${pgfraction}</a>`;
   };
 
 
   let render_book_stats_graph = function(data, type, row, meta) {
     const empty_stats = `<div title="Please open the book to calculate stats">&nbsp;</div>`;
-    let statuscounts = row[10];
+    let statuscounts = row['StatusDistribution'];
     if ((statuscounts ?? '')== '') {
       return empty_stats;
     }
@@ -285,9 +275,9 @@
 
   let render_book_actions = function ( data, type, row, meta ) {
     // TODO zzfuture fix: security - add CSRF token
-    const bkid = row[5];
-    const bktitle = encodeURIComponent(row[0]);
-    const is_active = (row[6] == 0);
+    const bkid = row['BkID'];
+    const bktitle = encodeURIComponent(row['BkTitle']);
+    const is_active = (row['BkArchived'] == 0);
 
     const links = [];
     const make_link = function(label, func) {
diff --git a/lute/templates/bookmarks/list.html b/lute/templates/bookmarks/list.html
index d8de1b69..846dcc9c 100644
--- a/lute/templates/bookmarks/list.html
+++ b/lute/templates/bookmarks/list.html
@@ -55,18 +55,14 @@ <h1>{{ book.title }}</h1>
         ],
         bottomEnd: 'paging'
       },
-      columnDefs: [
-        { "name": "TxOrder", "targets": 0, "width": "5%", className: "colVisToggled" },
-        { "name": "TbTitle", "targets": 1, "width": "70%", className: "colVisToggled", "render": render_page_link },
-        { "targets": 2, "data": null, "width": "15%", "searchable": false, "orderable": false, "render": render_bookmark_actions, className: "colVisToggled" },
-
-        // Hidden data for processing bookmark actions
-        { "name": "TbID", "targets": 3, "data": null, "visible": false },
+      columns: [
+        { name: "TxOrder", data: "TxOrder", width: "5%" },
+        { name: "TbTitle", width: "70%", render: render_page_link },
+        { data: null, width: "15%", searchable: false, orderable: false, render: render_bookmark_actions },
       ],
       buttons: [
         {
-          extend: 'colvis',
-          columns: '.colVisToggled'
+          extend: 'colvis'
         }
       ],
       responsive: true,
@@ -162,11 +158,9 @@ <h1>{{ book.title }}</h1>
   }
 
   let render_bookmark_actions = function(data, type, row, meta) {
-    // TODO zzfuture fix: security - add CSRF token
-
     const links = [];
     const make_link = function(label, func) {
-      const s = `<a href="#" data-bookmark_id="${row[2]}" data-title="${row[1]}" onclick="${func}(this)">${label}</a>`;
+      const s = `<a href="#" data-bookmark_id="${row['TbID']}" data-title="${row['TbTitle']}" onclick="${func}(this)">${label}</a>`;
       links.push(s);
     };
 
@@ -179,8 +173,8 @@ <h1>{{ book.title }}</h1>
   };
 
   const render_page_link = function(data, type, row, meta) {
-    page_num = row[0];
-    return `<a href=/read/{{book.id}}/page/${page_num}>${row[1]}</a>`
+    page_num = row['TxOrder'];
+    return `<a href=/read/{{book.id}}/page/${page_num}>${row['TbTitle']}</a>`
   }
 
   /**
diff --git a/lute/templates/term/index.html b/lute/templates/term/index.html
index e8241a41..3efac8f1 100644
--- a/lute/templates/term/index.html
+++ b/lute/templates/term/index.html
@@ -107,15 +107,6 @@
 
 <script>
 
-  // Column indexes returned in the datatables json.
-  const WORD_COL = 1;
-  const TRANSLATION_COL = 3;
-  const CREATED_DATE_COL = 7;
-  const WID_COL = 8;
-  const LID_COL = 9;
-  const IMG_COL = 10;
-  const STATUS_TEXT_COL = 13;
-
   let setup_term_datatable = function(initial_search) {
     var table = $('#termtable').DataTable({
       layout: {
@@ -150,26 +141,17 @@
         className: 'row-selected'
       },
       search: { search: initial_search },
-      columnDefs: [
-        // "chk" is included in the underlying SQL query.
-        // Without it, datatables would place the values
-        // in the wrong table columns.  Ugly hack, but works.
-        { name: "chk", targets: 0, searchable: false, orderable: false, data: null, render: render_checkbox },
-        { name: "WoText", targets: WORD_COL, render: render_text },
-        { name: "ParentText", targets: 2 },
-        { name: "WoTranslation", targets: TRANSLATION_COL, width: "40%", searchable: true, render: render_translation },
-        { name: "LgName", targets: 4 },
-        { name: "TagList", targets: 5 },
-        { name: "StID", targets: 6, render: render_status },
-        { name: "WoCreated", targets: CREATED_DATE_COL, render: render_date_created },
-
-        { name: "WoID", targets: WID_COL, visible: false },
-        { name: "LgID", targets: LID_COL, visible: false },
-        { name: "WiSource", targets: IMG_COL, visible: false },
-        { name: "StAbbreviation", targets: 11, visible: false },
-        { name: "SyncStatus", targets: 12, visible: false },
-        { name: "StText", targets: STATUS_TEXT_COL, visible: false },
-        { name: "WoRomanization", targets: 14, visible: false },
+      columns: [
+        { searchable: false, orderable: false, render: render_checkbox },
+        { name: "WoText", render: render_text },
+        { name: "ParentText", data: "ParentText" },
+        { name: "WoTranslation", width: "40%", searchable: true, render: render_translation },
+        { name: "LgName", data: "LgName" },
+        { name: "TagList", data: "TagList" },
+        { name: "StID", render: render_status },
+        { name: "WoCreated", render: render_date_created },
+        { name: "WoID", data: "WoID", visible: false },
+        { name: "LgID", data: "LgID", visible: false },
       ],
 
       // Ajax call
@@ -199,23 +181,23 @@
 
 
   let render_text = function ( data, type, row, meta ) {
-    return `<a href="/term/edit/${row[WID_COL]}">${row[WORD_COL]}</a>`;
+    return `<a href="/term/edit/${row['WoID']}">${row['WoText']}</a>`;
   };
 
   // Use the status ID for sorting, so Well Known comes after Learned (5),
   // but use the status text ("New (1)") for the cell display.
   let render_status = function ( data, type, row, meta ) {
-    return row[STATUS_TEXT_COL];
+    return row["StText"];
   };
 
   let render_checkbox = function (data, type, row, meta) {
-    return `<input type="checkbox" class="chkWord" name="wordids" wordid="${row[WID_COL]}" langid="${row[LID_COL]}" onclick="handleChkClick()">`;
+    return `<input type="checkbox" class="chkWord" name="wordids" wordid="${row['WoID']}" langid="${row['LgID']}" onclick="handleChkClick()">`;
   };
 
   let render_translation = function ( data, type, row, meta ) {
-    let tx = row[TRANSLATION_COL] ?? '';
+    let tx = row["WoTranslation"] ?? '';
     tx = tx.replaceAll("\r\n", "<br />");
-    let imgsrc = row[IMG_COL] ?? '';
+    let imgsrc = row["WiSource"] ?? '';
     if (imgsrc != '')
       imgsrc = `<img class="term-listing-image" style="margin-top: 5px;" src="${imgsrc}" />`;
     let ret = [ tx, imgsrc ].filter((s) => s != '');
@@ -223,7 +205,7 @@
   };
 
   let render_date_created = function (data, type, row, meta) {
-    const dt = row[CREATED_DATE_COL];
+    const dt = row["WoCreated"];
     const datepart = dt.split(' ')[0];
     return `<span title="${dt}">${datepart}</span>`;
   };
diff --git a/lute/templates/termtag/index.html b/lute/templates/termtag/index.html
index c45bc68a..68479b5d 100644
--- a/lute/templates/termtag/index.html
+++ b/lute/templates/termtag/index.html
@@ -37,35 +37,11 @@
       processing: true,
       serverSide: true,
       stateSave: true,
-      columnDefs: [
-        {
-          "name": "TgText", "targets": 0,
-          "render": function ( data, type, row, meta ) {
-            return `<a href="/termtag/edit/${row[3]}">${row[0]}</a>`;
-          }
-        },
-        { "name": "TgComment", "targets": 1 },
-        { "name": "TermCount", "targets": 2,
-          "render": function ( data, type, row, meta ) {
-            const count = parseInt(row[2]);
-            if (count == 0)
-              return '-';
-            return `<a href="/term/index/${row[0]}">${count}</a>`;
-          }
-        },
-        {
-          "targets": 3,
-          "data": null,
-          "searchable": false,
-          "orderable": false,
-          "render": function ( data, type, row, meta ) {
-            // TODO zzfuture fix: security - add CSRF token
-            const tgid = row[3];
-            return `<span id="deltermtag${tgid}" onclick="confirm_delete(${tgid})"><img src="{{ url_for('static', filename='/icn/minus-button.png') }}" title="Delete" /></span>`;
-          }
-        },
-        /* Extra data that is returned in the row for rendering, but not shown. */
-        { "name": "TgID", "targets": 4, "data": null, "visible": false }
+      columns: [
+        { name: "TgText", render: render_tag_text },
+        { name: "TgComment", data: "TgComment" },
+        { name: "TermCount", render: render_term_count },
+        { data: null, searchable: false, orderable: false, render: render_delete },
       ],
 
       // Ajax call
@@ -79,6 +55,22 @@
 
   } // end setup datatable
 
+  let render_tag_text = function ( data, type, row, meta ) {
+    return `<a href="/termtag/edit/${row['TgID']}">${row['TgText']}</a>`;
+  }
+
+  let render_term_count = function ( data, type, row, meta ) {
+    const count = parseInt(row['TermCount']);
+    if (count == 0)
+      return '-';
+    return count;
+  }
+
+  let render_delete = function ( data, type, row, meta ) {
+    // TODO zzfuture fix: security - add CSRF token
+    const tgid = row['TgID'];
+    return `<span id="deltermtag${tgid}" onclick="confirm_delete(${tgid})"><img src="{{ url_for('static', filename='/icn/minus-button.png') }}" title="Delete" /></span>`;
+  }
 
   $(document).ready(function () {
     setup_datatable();
diff --git a/lute/term/datatables.py b/lute/term/datatables.py
index b7b51bec..a07bfba6 100644
--- a/lute/term/datatables.py
+++ b/lute/term/datatables.py
@@ -10,7 +10,7 @@ def get_data_tables_list(parameters):
     "Term json data for datatables."
 
     base_sql = """SELECT
-    0 as chk, w.WoID as WoID, LgName, L.LgID as LgID, w.WoText as WoText, parents.parentlist as ParentText, w.WoTranslation,
+    w.WoID as WoID, LgName, L.LgID as LgID, w.WoText as WoText, parents.parentlist as ParentText, w.WoTranslation,
     w.WoRomanization,
     replace(wi.WiSource, '.jpeg', '') as WiSource,
     ifnull(tags.taglist, '') as TagList,
diff --git a/lute/term/routes.py b/lute/term/routes.py
index eff97700..f7ff65f2 100644
--- a/lute/term/routes.py
+++ b/lute/term/routes.py
@@ -72,39 +72,31 @@ def export_terms():
     parameters["length"] = 1000000
     outfile = os.path.join(current_app.env_config.temppath, "export_terms.csv")
     data = get_data_tables_list(parameters)
-    render_data = data["data"]
-
-    # Fields as returned from the datatables query.
-    headings = [
-        "OMIT_Checkbox",
-        "term",
-        "parent",
-        "translation",
-        "language",
-        "tags",
-        "OMIT_status_text",
-        "added",
-        "OMIT_WoID",
-        "OMIT_LgID",
-        "OMIT_ImageSource",
-        "status",
-        "link_status",
-        "OMIT_status_text",
-        "pronunciation",
-    ]
-    columns_to_exclude = []
-    for i, h in enumerate(headings):
-        if h.startswith("OMIT_"):
-            columns_to_exclude.append(i)
+    term_data = data["data"]
+
+    # Term data is an array of dicts, with the sql field name as dict
+    # keys.  These need to be mapped to headings.
+    heading_to_fieldname = {
+        "term": "WoText",
+        "parent": "ParentText",
+        "translation": "WoTranslation",
+        "language": "LgName",
+        "tags": "TagList",
+        "added": "WoCreated",
+        "status": "StID",
+        "link_status": "SyncStatus",
+        "pronunciation": "WoRomanization",
+    }
 
-    output_data = [headings] + render_data
+    headings = heading_to_fieldname.keys()
+    output_data = [
+        [r[heading_to_fieldname[fieldname]] for fieldname in headings]
+        for r in term_data
+    ]
     with open(outfile, "w", encoding="utf-8", newline="") as f:
         csv_writer = csv.writer(f)
-        for row in output_data:
-            filtered_row = [
-                value for i, value in enumerate(row) if i not in columns_to_exclude
-            ]
-            csv_writer.writerow(filtered_row)
+        csv_writer.writerow(headings)
+        csv_writer.writerows(output_data)
 
     return send_file(outfile, as_attachment=True, download_name="Terms.csv")
 
diff --git a/lute/utils/data_tables.py b/lute/utils/data_tables.py
index d91a513d..5f96c102 100644
--- a/lute/utils/data_tables.py
+++ b/lute/utils/data_tables.py
@@ -105,6 +105,37 @@ def parse_params(requestform) -> dict:
             "order": DataTablesFlaskParamParser._parse_order(request_params),
         }
 
+    @staticmethod
+    def parse_params_2(requestform) -> dict:
+        """Parse the request (query) parameters."""
+
+        # This method is currently unused, but may be used in the
+        # future.  The idea is to extract all params from the
+        # datatables request, and then have a separate method that
+        # takes these params explicitly as arguments, i.e. something
+        # like book_routes.get_data(start, length, search, order).
+        # This would allow for other front-end clients using something
+        # other than datatables.
+        request_params = requestform.to_dict(flat=True)
+
+        # Need the columns to get the name of the "order" field, as
+        # datatables only deals with the column indexes, not names.
+        columns = DataTablesFlaskParamParser._parse_columns(request_params)
+        order = DataTablesFlaskParamParser._parse_order(request_params)
+        real_order = []
+        for o in order:
+            col = [c["name"] for c in columns if c["index"] == o["column"]]
+            if len(col) == 1:
+                real_order.append({"column": col[0], "dir": o["dir"]})
+
+        return {
+            "draw": int(request_params.get("draw", 1)),
+            "start": int(request_params.get("start", 0)),
+            "length": int(request_params.get("length", -1)),
+            "search": request_params.get("search[value]"),
+            "order": real_order,
+        }
+
 
 class DataTablesSqliteQuery:
     "Get data for datatables rendering."
@@ -148,11 +179,16 @@ def get_sql(base_sql, parameters):
         def cols_with(attr):
             return [c["name"] for c in columns if c[attr] is True]
 
+        # Default sorting order is all cols marked orderable.
         orderby = ", ".join(cols_with("orderable"))
+
+        # Prepend indicated sorting.
         for order in parameters["order"]:
             col_index = int(order["column"])
-            sort_field = columns[col_index]["name"]
-            orderby = f"{sort_field} {order['dir']}, {orderby}"
+            col = columns[col_index]
+            sort_field = col["name"] or ""
+            if col["orderable"] is True and sort_field != "":
+                orderby = f"{sort_field} {order['dir']}, {orderby}"
         orderby = f"ORDER BY {orderby}"
 
         [where, params] = DataTablesSqliteQuery.where_and_params(
@@ -160,12 +196,10 @@ def cols_with(attr):
         )
 
         realbase = f"({base_sql}) realbase".replace("\n", " ")
-        select_field_list = ", ".join([c["name"] for c in columns if c["name"] != ""])
-
         start = parameters["start"]
         length = parameters["length"]
         # pylint: disable=line-too-long
-        data_sql = f"SELECT {select_field_list} FROM (select * from {realbase} {where} {orderby} LIMIT {start}, {length}) src {orderby}"
+        data_sql = f"SELECT * FROM (select * from {realbase} {where} {orderby} LIMIT {start}, {length}) src {orderby}"
 
         return {
             "recordsTotal": f"select count(*) from {realbase}",
@@ -194,7 +228,10 @@ def runqry(name, use_params=True):
             recordsTotal = runqry("recordsTotal", False).fetchone()[0]
             recordsFiltered = runqry("recordsFiltered").fetchone()[0]
             res = runqry("data")
-            ret = [list(row) for row in res.fetchall()]
+            column_names = res.keys()
+            # Convert each row into a dict, { fieldname: value ... }
+            ret = [dict(zip(column_names, row)) for row in res.fetchall()]
+
         except Exception as e:
             raise e
 
diff --git a/tests/unit/book/test_datatables.py b/tests/unit/book/test_datatables.py
index 2efb1511..35bad76d 100644
--- a/tests/unit/book/test_datatables.py
+++ b/tests/unit/book/test_datatables.py
@@ -65,11 +65,13 @@ def test_book_data_says_completed_if_last_page_has_been_read(
     _dt_params["search"] = {"value": "title", "regex": False}
     d = get_data_tables_list(_dt_params, False)
     actual = d["data"][0]
-    assert actual == [b.id, "title", 0], "not completed"
+    assert actual["BkID"] == b.id, "correct book"
+    assert actual["IsCompleted"] == 0, "not completed"
     t = b.texts[0]
     t.read_date = datetime.now()
     db.session.add(t)
     db.session.commit()
     d = get_data_tables_list(_dt_params, False)
     actual = d["data"][0]
-    assert actual == [b.id, "title", 1], "completed"
+    assert actual["BkID"] == b.id, "correct book"
+    assert actual["IsCompleted"] == 1, "completed"
diff --git a/tests/unit/utils/test_DataTablesSqliteQuery.py b/tests/unit/utils/test_DataTablesSqliteQuery.py
index bbd446e4..8210f2ab 100644
--- a/tests/unit/utils/test_DataTablesSqliteQuery.py
+++ b/tests/unit/utils/test_DataTablesSqliteQuery.py
@@ -45,7 +45,7 @@ def test_smoke_test(basesql, parameters):
     expected = {
         "recordsTotal": "select count(*) from (select CatID, Color, Food from Cats) realbase",
         "recordsFiltered": "select count(*) from (select CatID, Color, Food from Cats) realbase ",
-        "data": "SELECT CatID, Color, Food FROM (select * from (select CatID, Color, Food from Cats) realbase  ORDER BY Color asc, Color, Food LIMIT 10, 50) src ORDER BY Color asc, Color, Food",
+        "data": "SELECT * FROM (select * from (select CatID, Color, Food from Cats) realbase  ORDER BY Color asc, Color, Food LIMIT 10, 50) src ORDER BY Color asc, Color, Food",
         "params": {},
         "draw": 1,
     }
@@ -61,7 +61,7 @@ def test_sorting(basesql, parameters):
     expected = {
         "recordsTotal": "select count(*) from (select CatID, Color, Food from Cats) realbase",
         "recordsFiltered": "select count(*) from (select CatID, Color, Food from Cats) realbase ",
-        "data": "SELECT CatID, Color, Food FROM (select * from (select CatID, Color, Food from Cats) realbase  ORDER BY Food desc, Color, Food LIMIT 10, 50) src ORDER BY Food desc, Color, Food",
+        "data": "SELECT * FROM (select * from (select CatID, Color, Food from Cats) realbase  ORDER BY Food desc, Color, Food LIMIT 10, 50) src ORDER BY Food desc, Color, Food",
         "params": {},
         "draw": 1,
     }
@@ -77,7 +77,7 @@ def test_single_search(basesql, parameters):
     expected = {
         "recordsTotal": "select count(*) from (select CatID, Color, Food from Cats) realbase",
         "recordsFiltered": "select count(*) from (select CatID, Color, Food from Cats) realbase WHERE (Color LIKE '%' || :s0 || '%' OR Food LIKE '%' || :s0 || '%')",
-        "data": "SELECT CatID, Color, Food FROM (select * from (select CatID, Color, Food from Cats) realbase WHERE (Color LIKE '%' || :s0 || '%' OR Food LIKE '%' || :s0 || '%') ORDER BY Color asc, Color, Food LIMIT 10, 50) src ORDER BY Color asc, Color, Food",
+        "data": "SELECT * FROM (select * from (select CatID, Color, Food from Cats) realbase WHERE (Color LIKE '%' || :s0 || '%' OR Food LIKE '%' || :s0 || '%') ORDER BY Color asc, Color, Food LIMIT 10, 50) src ORDER BY Color asc, Color, Food",
         "params": {"s0": "XXX"},
         "draw": 1,
     }
@@ -93,7 +93,7 @@ def test_multiple_search_terms(basesql, parameters):
     expected = {
         "recordsTotal": "select count(*) from (select CatID, Color, Food from Cats) realbase",
         "recordsFiltered": "select count(*) from (select CatID, Color, Food from Cats) realbase WHERE (Color LIKE '%' || :s0 || '%' OR Food LIKE '%' || :s0 || '%') AND (Color LIKE '%' || :s1 || '%' OR Food LIKE '%' || :s1 || '%')",
-        "data": "SELECT CatID, Color, Food FROM (select * from (select CatID, Color, Food from Cats) realbase WHERE (Color LIKE '%' || :s0 || '%' OR Food LIKE '%' || :s0 || '%') AND (Color LIKE '%' || :s1 || '%' OR Food LIKE '%' || :s1 || '%') ORDER BY Color asc, Color, Food LIMIT 10, 50) src ORDER BY Color asc, Color, Food",
+        "data": "SELECT * FROM (select * from (select CatID, Color, Food from Cats) realbase WHERE (Color LIKE '%' || :s0 || '%' OR Food LIKE '%' || :s0 || '%') AND (Color LIKE '%' || :s1 || '%' OR Food LIKE '%' || :s1 || '%') ORDER BY Color asc, Color, Food LIMIT 10, 50) src ORDER BY Color asc, Color, Food",
         "params": {"s0": "XXX", "s1": "YYY"},
         "draw": 1,
     }