Remove empty column from projection on upsert select, fix runOnServer check
Move removal of empty column from projection to only occur if upsert select run on server