Simplify url_for override as per Jonathan's recommendations.
remove trailing param to prevent html_sections breaking on locale param.