Revised sort order of tables