Updated all queries to include c_id - refs BT#6759