diff --git a/Oqtane.Client/Modules/Admin/SearchResults/Index.razor b/Oqtane.Client/Modules/Admin/SearchResults/Index.razor
index 3b25090e..01039a51 100644
--- a/Oqtane.Client/Modules/Admin/SearchResults/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SearchResults/Index.razor
@@ -1,24 +1,25 @@
-@using Microsoft.AspNetCore.Http
 @using Oqtane.Services
 @using System.Net
 @namespace Oqtane.Modules.Admin.SearchResults
 @inherits ModuleBase
+@inject NavigationManager NavigationManager
 @inject ISearchResultsService SearchResultsService
 @inject IStringLocalizer<Index> Localizer
-@inject IHttpContextAccessor HttpContext
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="search-result-container">
     <div class="row">
         <div class="col">
-            <form method="post" @formname="SearchInputForm" @onsubmit="@(async () => await Search())" data-enhance>
+            <form method="post" @formname="SearchInputForm" @onsubmit="Search" data-enhance>
                 <div class="input-group mb-3">
-                    <span class="input-group-text">@Localizer["SearchPrefix"]</span>
+                    <span class="input-group-text">@Localizer["SearchLabel"]</span>
                     <input type="hidden" name="@Constants.RequestVerificationToken" value="@SiteState.AntiForgeryToken" />
                     <input type="text" name="keywords" class="form-control shadow-none" maxlength="50"
                             aria-label="Keywords"
                             placeholder="@Localizer["SearchPlaceholder"]"
-                            @bind-value="_keywords">
-                    <button class="btn btn-primary shadow-none" type="submit">@Localizer["Search"]</button>
+                            @bind="@_keywords">
+                    <button class="btn btn-primary" type="submit">@SharedLocalizer["Search"]</button>
+                    <a class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Reset"]</a>
                 </div>
             </form>
         </div>
@@ -37,9 +38,6 @@
                     {
                         <Pager Items="@_searchResults?.Results"
                                Format="Grid"
-                               PageSize="@_pageSize.ToString()"
-                               DisplayPages="@_displayPages.ToString()"
-                               CurrentPage="@_currentPage.ToString()"
                                Columns="1"
                                Toolbar="Bottom"
                                Parameters="@($"q={_keywords}")">
@@ -65,24 +63,18 @@
 </div>
 @code {
     public override string RenderMode => RenderModes.Static;
-    private const int SearchDefaultPageSize = 10;
 
     private SearchSortDirections _searchSortDirection = SearchSortDirections.Descending; //default sort by
     private SearchSortFields _searchSortField = SearchSortFields.Relevance;
     private string _keywords;
     private bool _loading;
     private SearchResults _searchResults;
-    private int _currentPage = 0;
-    private int _pageSize = SearchDefaultPageSize;
-    private int _displayPages = 7;
+
+    [SupplyParameterFromForm(FormName = "SearchInputForm")]
+    public string KeyWords { get => ""; set => _keywords = value; }
 
     protected override async Task OnInitializedAsync()
     {
-        if (ModuleState.Settings.ContainsKey("PageSize"))
-        {
-            _pageSize = int.Parse(ModuleState.Settings["PageSize"]);
-        }
-
         if (PageState.QueryString.ContainsKey("q"))
         {
             _keywords = WebUtility.UrlDecode(PageState.QueryString["q"]);
@@ -94,20 +86,9 @@
         }
     }
 
-    private async Task Search()
+    private void Search()
     {
-        _keywords = HttpContext.HttpContext.Request.Form["keywords"];
-        if (string.IsNullOrEmpty(_keywords))
-        {
-            AddModuleMessage(Localizer["MissingKeywords"], MessageType.Warning);
-        }
-        else
-        {
-            ClearModuleMessage();
-
-            _currentPage = 0;
-            await PerformSearch();
-        }
+        NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, $"page=1&q={_keywords}"));
     }
 
     private async Task PerformSearch()
diff --git a/Oqtane.Client/Modules/Admin/SearchResults/ModuleInfo.cs b/Oqtane.Client/Modules/Admin/SearchResults/ModuleInfo.cs
index 97a6835e..a65123d4 100644
--- a/Oqtane.Client/Modules/Admin/SearchResults/ModuleInfo.cs
+++ b/Oqtane.Client/Modules/Admin/SearchResults/ModuleInfo.cs
@@ -13,8 +13,6 @@ namespace Oqtane.Modules.Admin.SearchResults
             Name = "Search Results",
             Description = "Display Search Results",
             Version = Constants.Version,
-            ServerManagerType = "",
-            SettingsType = "Oqtane.Modules.Admin.SearchResults.Settings, Oqtane.Client",
             Resources = new List<Resource>()
             {
                 new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Module.css" }
diff --git a/Oqtane.Client/Modules/Admin/SearchResults/Settings.razor b/Oqtane.Client/Modules/Admin/SearchResults/Settings.razor
deleted file mode 100644
index 1e98f0f6..00000000
--- a/Oqtane.Client/Modules/Admin/SearchResults/Settings.razor
+++ /dev/null
@@ -1,48 +0,0 @@
-@namespace Oqtane.Modules.Admin.SearchResults
-@inherits ModuleBase
-@implements Oqtane.Interfaces.ISettingsControl
-@inject ISettingService SettingService
-@inject IStringLocalizer<Settings> Localizer
-@inject IStringLocalizer<SharedResources> SharedLocalizer
-
-<div class="container">
-    <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="pageSize" ResourceKey="PageSize" ResourceType="@resourceType">Page Size:</Label>
-        <div class="col-sm-9">
-            <input name="pageSize" id="pageSize" class="form-control" type="number" @bind="_pageSize" />
-        </div>
-    </div>
-</div>
-
-@code {		
-    private const string SearchDefaultPageSize = "10";
-
-    private string resourceType = "Oqtane.Modules.Admin.SearchResults.Settings, Oqtane.Client"; // for localization
-    private string _pageSize;
-
-    protected override void OnInitialized()
-    {
-        try
-        {
-            _pageSize = SettingService.GetSetting(ModuleState.Settings, "PageSize", SearchDefaultPageSize);
-		}
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-
-    public async Task UpdateSettings()
-    {
-        try
-        {
-			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-            settings = SettingService.SetSetting(settings, "PageSize", _pageSize);
-			await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-}
diff --git a/Oqtane.Client/Resources/Modules/Admin/SearchResults/Index.resx b/Oqtane.Client/Resources/Modules/Admin/SearchResults/Index.resx
index bd07f3f8..d1d1d8fa 100644
--- a/Oqtane.Client/Resources/Modules/Admin/SearchResults/Index.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/SearchResults/Index.resx
@@ -117,40 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Ascending" xml:space="preserve">
-    <value>Ascending</value>
-  </data>
-  <data name="Descending" xml:space="preserve">
-    <value>Descending</value>
-  </data>
-  <data name="MissingKeywords" xml:space="preserve">
-    <value>Please provide the search keywords.</value>
-  </data>
-  <data name="ModificationTime" xml:space="preserve">
-    <value>Modification Time</value>
-  </data>
   <data name="NoResult" xml:space="preserve">
-    <value>No results found.</value>
+    <value>No Content Matches The Criteria Provided</value>
   </data>
-  <data name="Relevance" xml:space="preserve">
-    <value>Relevance</value>
-  </data>
-  <data name="Search" xml:space="preserve">
-    <value>Search</value>
+  <data name="SearchLabel" xml:space="preserve">
+    <value>Search:</value>
   </data>
   <data name="SearchPlaceholder" xml:space="preserve">
     <value>Search</value>
   </data>
-  <data name="SearchPrefix" xml:space="preserve">
-    <value>Search:</value>
-  </data>
-  <data name="SortDirection" xml:space="preserve">
-    <value>Sort Direction</value>
-  </data>
-  <data name="SortField" xml:space="preserve">
-    <value>Sort By</value>
-  </data>
-  <data name="Title" xml:space="preserve">
-    <value>Title</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/SearchResults/Settings.resx b/Oqtane.Client/Resources/Modules/Admin/SearchResults/Settings.resx
deleted file mode 100644
index 1c48707d..00000000
--- a/Oqtane.Client/Resources/Modules/Admin/SearchResults/Settings.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="PageSize" xml:space="preserve">
-    <value>Page Size</value>
-  </data>
-</root>
\ No newline at end of file