Added delivery time range instead of maximum date
Fixed minor bugs