Correctly handle projects with validated and non-validated samples