diff --git a/ct/gomft.sh b/ct/gomft.sh
index b16388217..f1788cc0b 100644
--- a/ct/gomft.sh
+++ b/ct/gomft.sh
@@ -53,6 +53,43 @@ function update_script() {
     cd /opt/gomft
     $STD npm install
     $STD npm run build
+    TEMPL_VERSION="$(awk '/github.com\/a-h\/templ/{print $2}' go.mod)"
+    $STD go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION}
+    # dirty hack to fix templ
+    cat <<'EOF' >/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ
+package search
+
+import (
+    "context"
+    "github.com/starfleetcptn/gomft/components/file_metadata"
+    "github.com/starfleetcptn/gomft/components/file_metadata/list"
+)
+
+templ FileMetadataSearchContent(ctx context.Context, data file_metadata.FileMetadataSearchData) {
+    <!-- Search Results -->
+    <div id="search-results">
+        if len(data.Files) > 0 {
+            @list.FileMetadataListPartial(ctx, file_metadata.FileMetadataListData{
+                Files:      data.Files,
+                Page:       data.Page,
+                Limit:      data.Limit,
+                TotalCount: data.TotalCount,
+                TotalPages: data.TotalPages,
+                Filter:     data.Filter,
+                SortBy:     data.SortBy,
+                SortDir:    data.SortDir,
+            }, "/files/search/partial", "#search-results-container")
+        } else {
+            <div class="p-6 text-center text-gray-500 dark:text-gray-400">
+                <svg class="mx-auto mb-4 w-12 h-12 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+                </svg>
+                <p>No files found matching your search criteria.</p>
+            </div>
+        }
+    </div>
+}
+EOF
     $STD "$HOME"/go/bin/templ generate
     export CGO_ENABLED=1
     export GOOS=linux
diff --git a/frontend/public/json/gomft.json.bak b/frontend/public/json/gomft.json
similarity index 100%
rename from frontend/public/json/gomft.json.bak
rename to frontend/public/json/gomft.json
diff --git a/install/gomft-install.sh b/install/gomft-install.sh
index ae9c9a8a5..1e6d2389a 100644
--- a/install/gomft-install.sh
+++ b/install/gomft-install.sh
@@ -36,9 +36,41 @@ cd /opt/gomft
 TEMPL_VERSION="$(awk '/github.com\/a-h\/templ/{print $2}' go.mod)"
 $STD go install github.com/a-h/templ/cmd/templ@${TEMPL_VERSION}
 cp /opt/gomft/components/file_metadata/search/file_metadata_search_content.templ{,.bak}
-sed -i -e '/<div id="search-results">/a \    @{' \
-  -e '/^        }$/a \    }' \
-  /opt/gomft/components/file_metadata/search/file_metadata_search_content.templ
+# dirty hack to fix templ
+cat <<'EOF' >/opt/gomft/components/file_metadata/search/file_metadata_search_content.templ
+package search
+
+import (
+    "context"
+    "github.com/starfleetcptn/gomft/components/file_metadata"
+    "github.com/starfleetcptn/gomft/components/file_metadata/list"
+)
+
+templ FileMetadataSearchContent(ctx context.Context, data file_metadata.FileMetadataSearchData) {
+    <!-- Search Results -->
+    <div id="search-results">
+        if len(data.Files) > 0 {
+            @list.FileMetadataListPartial(ctx, file_metadata.FileMetadataListData{
+                Files:      data.Files,
+                Page:       data.Page,
+                Limit:      data.Limit,
+                TotalCount: data.TotalCount,
+                TotalPages: data.TotalPages,
+                Filter:     data.Filter,
+                SortBy:     data.SortBy,
+                SortDir:    data.SortDir,
+            }, "/files/search/partial", "#search-results-container")
+        } else {
+            <div class="p-6 text-center text-gray-500 dark:text-gray-400">
+                <svg class="mx-auto mb-4 w-12 h-12 text-gray-400" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+                </svg>
+                <p>No files found matching your search criteria.</p>
+            </div>
+        }
+    </div>
+}
+EOF
 $STD "$HOME"/go/bin/templ generate
 $STD go build -o gomft main.go
 chmod +x /opt/gomft/gomft