Add calendar and html_entity_decode header redirects