Bug fix for table and grid with extra elements