CC-5778 : Improving Builder Rendering Time

fix for empty rows.