Fix for WK-107: Organize columns confused about nested tables