BS-11785: fix elements used in ComparisonScope