Move removal of empty column from projection to only occur if upsert select run on server