Small changes of validation for deleted items