More improvements to expandable tables