diff --git a/src/layouts/partials/package-grid.html b/src/layouts/partials/package-grid.html
index 3b56645..93a7e9d 100644
--- a/src/layouts/partials/package-grid.html
+++ b/src/layouts/partials/package-grid.html
@@ -121,11 +121,13 @@
     if (searchInput.value) {
       const term = searchInput.value;
       const packages = getPackageThumbs();
+      for(let pkg of packages) {
+        pkg.match_score = getMatchScore(term, pkg.dataset);
+      }
       const sortedPackages = packages.sort((a, b) => {
-        const aScore = getMatchScore(term, a.dataset);
-        const bScore = getMatchScore(term, b.dataset);
-        return bScore - aScore;
+        return b.match_score - (a ? a.match_score : 0);
       });
+
       const grid = document.getElementById('packageGrid');
       grid.textContent = '';
       let searchCount = 0;
@@ -209,10 +211,11 @@
 
   function getMatchScore(term, dataset) {
     // provide higher value with name
-    const { name, description } = dataset;
+    const { name, maintainer, description } = dataset;
+    const exactMatch = [maintainer, name].join(" ").toLocaleLowerCase().includes(term.toLocaleLowerCase());
     const nameScore = stringSimilarity.compareTwoStrings(name, term);
     const descriptionScore = stringSimilarity.compareTwoStrings(description, term);
-    return (nameScore*80) + (descriptionScore*20)
+    return (nameScore*80) + (descriptionScore*20) + (exactMatch ? 100 : 0);
   }
 
   const loadMoreButton = document.getElementById('loadMorePackagesBtn');
diff --git a/src/layouts/partials/package-thumbnail.html b/src/layouts/partials/package-thumbnail.html
index 1ba5fe3..7fc5dd6 100644
--- a/src/layouts/partials/package-thumbnail.html
+++ b/src/layouts/partials/package-thumbnail.html
@@ -1,4 +1,4 @@
-<div class="card card-thumbnail" style="width: 100%" data-name="{{- .name -}}" data-popularity="{{- .dl_count -}}" data-last_modified="{{- .last_modified -}}" data-description="{{- .desc -}}">
+<div class="card card-thumbnail" style="width: 100%" data-name="{{- .name -}}" data-popularity="{{- .dl_count -}}" data-last_modified="{{- .last_modified -}}" data-description="{{- .desc -}}" data-maintainer="{{- .maintainer -}}">
   <a href="/+{{- lower .full_name -}}/">
     <div class="p-3">
     <figure class="card-img-top" >