diff --git a/src/Umbraco.Web.Common/Filters/ModelBindingExceptionFilter.cs b/src/Umbraco.Web.Common/Filters/ModelBindingExceptionFilter.cs
index 5367af68d5..559a02e149 100644
--- a/src/Umbraco.Web.Common/Filters/ModelBindingExceptionFilter.cs
+++ b/src/Umbraco.Web.Common/Filters/ModelBindingExceptionFilter.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Common.Filters
                     && IsMessageAboutTheSameModelType(filterContext.Exception.Message)))
             {
                 filterContext.HttpContext.Response.Headers.Add(HttpResponseHeader.RetryAfter.ToString(), "1");
-                filterContext.Result = new RedirectResult(filterContext.HttpContext.Request.GetDisplayUrl(), false);
+                filterContext.Result = new RedirectResult(filterContext.HttpContext.Request.GetEncodedUrl(), false);
 
                 filterContext.ExceptionHandled = true;
             }
diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index 19daf13e89..918b483bfe 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -11,13 +11,10 @@ using Umbraco.Core.Configuration;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Web.BackOffice.AspNetCore;
-using Umbraco.Web.Common.AspNetCore;
 using Umbraco.Web.Common.Extensions;
-using Umbraco.Web.Common.ModelBinders;
 using Umbraco.Web.Website.AspNetCore;
 using IHostingEnvironment = Umbraco.Core.Hosting.IHostingEnvironment;
 
-
 namespace Umbraco.Web.UI.BackOffice
 {
     public class Startup
@@ -48,10 +45,7 @@ namespace Umbraco.Web.UI.BackOffice
             services.AddUmbracoCore(_env, out var factory);
             services.AddUmbracoWebsite();
 
-            services.AddMvc(options =>
-                {
-                    options.ModelBinderProviders.Insert(0, new ContentModelBinderProvider());
-                });
+            services.AddMvc();
             services.AddMiniProfiler(options =>
             {
                 options.ShouldProfile = request => false; // WebProfiler determine and start profiling. We should not use the MiniProfilerMiddleware to also profile