Added failure marking and filtering