Fixed empty rows showing