diff --git a/src/apps/fossdb/templates/detailed_view.html b/src/apps/fossdb/templates/detailed_view.html
index 457b72c..51e78ed 100644
--- a/src/apps/fossdb/templates/detailed_view.html
+++ b/src/apps/fossdb/templates/detailed_view.html
@@ -77,7 +77,7 @@
             <!-- tags -->
             <div class="my-8 flex flex-wrap justify-center items-start gap-2">
                 {% for tag in project.tag.all|dictsort:"name" %}
-                    <a href="/search/?q={{ tag.name }}">
+                    <a href="/search/?q={{ tag.name|remove_spaces }}">
                         <span title="{{ tag.description }}"
                               class="bg-opacity-0 border rounded-xl border-slategray-200 px-3 text-xs min-w-16 hover:bg-steelblue-400 hover:bg-opacity-60 transform duration-200 ease-linear">
                             {{ tag }}
@@ -88,7 +88,7 @@
             <!-- programming languages -->
             <div class="my-8 flex flex-wrap justify-center items-start gap-2">
                 {% for language in project.projectprogramminglanguage_set.all|dictsortreversed:"percentage" %}
-                    <a href="/search/?q={{ language.name }}">
+                    <a href="/search/?q={{ language.name|remove_spaces }}">
                         <span title="{{ language.percentage }}%"
                               class="bg-opacity-0 border rounded-xl border-slategray-200 px-3 text-xs min-w-16 hover:bg-steelblue-400 hover:bg-opacity-60 transform duration-200 ease-linear">
                             {{ language.programming_language }}
diff --git a/src/apps/fossdb/templatetags/custom_filters.py b/src/apps/fossdb/templatetags/custom_filters.py
new file mode 100644
index 0000000..bdb5afa
--- /dev/null
+++ b/src/apps/fossdb/templatetags/custom_filters.py
@@ -0,0 +1,8 @@
+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def remove_spaces(value):
+    return value.replace(" ", "+")