fix improper sanitization
implement delivery time estimation