More improvement on delivery_date calendar select