fix bugs in delivery filter