OPSMN-1525: Use identifier to join and record entry id to lookup the record