Fixing logic for tabs as column option