Fixes for nested columns
Additional fixes for nested columns