fix broken link and after update when delivery_id may be blank