FEND-1123 & FEND-1102 logic errors handling crossref