diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
index f47c817ec..e4adee318 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
@@ -93,7 +93,7 @@ namespace Orchard.Tags.Controllers {
             }
             catch (Exception exception) {
                 _notifier.Error(T("Retrieving tagged items failed: " + exception.Message));
-                return Index();
+                return RedirectToAction("Index");
             }
         }
     }
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
index 991458989..2c4131362 100644
--- a/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Orchard.Tags.csproj
@@ -69,6 +69,7 @@
     <Compile Include="Models\TagsHandler.cs" />
     <Compile Include="Permissions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Routes.cs" />
     <Compile Include="Services\TagService.cs" />
     <Compile Include="ViewModels\TagsAdminCreateViewModel.cs" />
     <Compile Include="ViewModels\TagsAdminEditViewModel.cs" />
diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Routes.cs b/src/Orchard.Web/Packages/Orchard.Tags/Routes.cs
new file mode 100644
index 000000000..9f0de6bfd
--- /dev/null
+++ b/src/Orchard.Web/Packages/Orchard.Tags/Routes.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using System.Web.Mvc;
+using System.Web.Routing;
+using Orchard.Mvc.Routes;
+
+namespace Orchard.Tags {
+    public class Routes : IRouteProvider {
+        public void GetRoutes(ICollection<RouteDescriptor> routes) {
+            foreach (var routeDescriptor in GetRoutes())
+                routes.Add(routeDescriptor);
+        }
+
+        public IEnumerable<RouteDescriptor> GetRoutes() {
+            return new[] {
+                             new RouteDescriptor {   Priority = 5,
+                                                     Route = new Route(
+                                                         "Tags/{tagName}",
+                                                         new RouteValueDictionary {
+                                                                                      {"area", "Orchard.Tags"},
+                                                                                      {"controller", "Home"},
+                                                                                      {"action", "Search"}
+                                                         },
+                                                         new RouteValueDictionary(),
+                                                         new RouteValueDictionary {
+                                                                                      {"area", "Orchard.Tags"}
+                                                         },
+                                                         new MvcRouteHandler())
+                             }
+                         };
+        }
+    }
+}
\ No newline at end of file