Fixed all issues related to empty columns