NYCCHKBK-4704 and bug fixes for multiple sub contract reference ids