Nested tables row splitting working (more fixes)