Fixed Success view / duplicate check