An improvement to the layout for very complex query plans