[OE-3659] fixed diagnoses add/removal