First-stab into fixing sorting tables with tags