Fix up finding of the header
Merge branch 'table-specific-handle' into fatbox