diff --git a/cookbook/models.py b/cookbook/models.py
index 3f198e640..c4816ed6f 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -1,3 +1,4 @@
+import operator
 import re
 import uuid
 from datetime import date, timedelta
@@ -53,9 +54,11 @@ class PermissionModelMixin:
 
     def get_space(self):
         p = '.'.join(self.get_space_key())
-        if getattr(self, p, None):
-            return getattr(self, p)
-        raise NotImplementedError('get space for method not implemented and standard fields not available')
+        try:
+            if space := operator.attrgetter(p)(self):
+                return space
+        except AttributeError:
+            raise NotImplementedError('get space for method not implemented and standard fields not available')
 
 
 class Space(ExportModelOperationsMixin('space'), models.Model):
diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index cd9a7018c..17ebea158 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -140,7 +140,7 @@
                 {% page_help request.resolver_match.url_name as help_button %}
                 {% if help_button %}{{ help_button|safe }}{% endif %}
 
-                <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_settings,view_history,view_system,docs_markdown' %}active{% endif %}">
+                <li class="nav-item dropdown {% if request.resolver_match.url_name in 'view_space,view_settings,view_history,view_system,docs_markdown' %}active{% endif %}">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                        aria-haspopup="true" aria-expanded="false"><i
                             class="fas fa-user-alt"></i> {{ user.get_user_name }}
diff --git a/cookbook/views/data.py b/cookbook/views/data.py
index c5dd61416..52c2fb4ee 100644
--- a/cookbook/views/data.py
+++ b/cookbook/views/data.py
@@ -148,13 +148,11 @@ def import_url(request):
         recipe.steps.add(step)
 
         for kw in data['keywords']:
-            # if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
-            #     recipe.keywords.add(k)
-            # elif data['all_keywords']:
-            #     k = Keyword.objects.create(name=kw['text'], space=request.space)
-            #     recipe.keywords.add(k)
-            k, created = Keyword.objects.get_or_create(name=kw['text'].strip(), space=request.space)
-            recipe.keywords.add(k)
+            if k := Keyword.objects.filter(name=kw['text'], space=request.space).first():
+                recipe.keywords.add(k)
+            elif data['all_keywords']:
+                k = Keyword.objects.create(name=kw['text'], space=request.space)
+                recipe.keywords.add(k)
 
         for ing in data['recipeIngredient']:
             ingredient = Ingredient()