modified code for previos commit
added condition to hide rows if no record found
handled when cluster unit is nil