table is now 'agnostic' and removed references to order_fields & sort fields