Fixes to templates and to parameter extraction in Routing.