Updated SQL statements in cdt-stage to account for other changes