Fix removing items from reference
Fix editing cross reference