Some changes
Delivery checks,query filter