diff --git a/common/models.py b/common/models.py
index 8a65635a..7c0c80e3 100644
--- a/common/models.py
+++ b/common/models.py
@@ -202,7 +202,7 @@ class UserOwnedEntity(models.Model):
         """
         user_owned_entities = cls.objects.filter(owner=owner)
         if is_following:
-            user_owned_entities = user_owned_entities.exclude(visibility__ne=2)
+            user_owned_entities = user_owned_entities.exclude(visibility=2)
         else:
             user_owned_entities = user_owned_entities.filter(visibility=0)
         return user_owned_entities
@@ -269,7 +269,7 @@ class Tag(models.Model):
     def find_by_user(cls, tag, owner, is_following):
         user_owned_entities = cls.objects.filter(content=tag, mark__owner=owner)
         if is_following:
-            user_owned_entities = user_owned_entities.exclude(mark__visibility__ne=2)
+            user_owned_entities = user_owned_entities.exclude(mark__visibility=2)
         else:
             user_owned_entities = user_owned_entities.filter(mark__visibility=0)
         return user_owned_entities
diff --git a/common/templates/partial/list_item_movie.html b/common/templates/partial/list_item_movie.html
index 3e228c68..e947ed30 100644
--- a/common/templates/partial/list_item_movie.html
+++ b/common/templates/partial/list_item_movie.html
@@ -66,7 +66,16 @@
 
             {% if movie.director %}{% trans '导演' %}:
             {% for director in movie.director %}
+<<<<<<< Updated upstream
             {{ director }}{% if not forloop.last %} {% endif %}
+=======
+            {% if request.GET.q %}
+            {{ director | highlight:request.GET.q }}
+            {% else %}
+            {{ director }}
+            {% endif %}
+            {% if not forloop.last %},{% endif %}
+>>>>>>> Stashed changes
             {% endfor %}/
             {% endif %}