Fix waste edition and deletion