Fix delivery_method and urls for track and comment in email notification