Remove empty column from projection on upsert select, fix runOnServer check