improve to done and undone filtering