diff --git a/zero.Core/Database/Indexes/Routes_ForResolver.cs b/zero.Core/Database/Indexes/Routes_ForResolver.cs
new file mode 100644
index 00000000..28fc2b64
--- /dev/null
+++ b/zero.Core/Database/Indexes/Routes_ForResolver.cs
@@ -0,0 +1,19 @@
+using Raven.Client.Documents.Indexes;
+using System.Linq;
+using zero.Core.Routing;
+
+namespace zero.Core.Database.Indexes
+{
+  public class Routes_ForResolver : AbstractIndexCreationTask<Route>
+  {
+    public Routes_ForResolver()
+    {
+      Map = items => items
+        .Select(x => new
+        {
+          Url = x.Url,
+          AllowSuffix = x.AllowSuffix
+        });
+    }
+  }
+}
\ No newline at end of file
diff --git a/zero.Core/Routing/Routes.cs b/zero.Core/Routing/Routes.cs
index 65ed7bcf..b5b880ec 100644
--- a/zero.Core/Routing/Routes.cs
+++ b/zero.Core/Routing/Routes.cs
@@ -9,6 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using zero.Core.Database;
+using zero.Core.Database.Indexes;
 using zero.Core.Entities;
 using zero.Core.Extensions;
 using zero.Core.Options;
@@ -138,7 +139,7 @@ namespace zero.Core.Routing
         min -= 1;
       }
 
-      IList<Route> routes = await session.Query<Route>()
+      IList<Route> routes = await session.Query<Route, Routes_ForResolver>()
         .Where(x => (!x.AllowSuffix && x.Url == path) || (x.AllowSuffix && x.Url.In(parts)))
         .Include("References[].Id")
         .Include("Dependencies")