update CQID to utilize new subject_mapping entities