Fixup column and dataset id handling
Reorg. Turns out Lab only needs "bottom" layer