diff --git a/apps/api/urls.py b/apps/api/urls.py
index 03d6bd680fbbf34f14e1d43d06557c82daa6c950..b74efc887ac5e11a7c57cad915df28e1c62bf963 100644
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -54,7 +54,7 @@ class UserViewSet(ReadProtectedModelViewSet):
     serializer_class = UserSerializer
     filter_backends = [DjangoFilterBackend, SearchFilter]
     filterset_fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_superuser', 'is_staff', 'is_active', ]
-    search_fields = ['$username', '$first_name', '$last_name', ]
+    search_fields = ['$username', '$first_name', '$last_name', '$note__alias__name', '$note__alias__normalized_name', ]
 
 
 # This ViewSet is the only one that is accessible from all authenticated users!
diff --git a/apps/member/views.py b/apps/member/views.py
index 83304b06c2aea33f67ce6f7e5d480fba52fa8fc1..ebcd9d7b94614184b57f866072e2c14ba19b7866 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -326,8 +326,8 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
 
             qs = qs.filter(
                 Q(name__iregex=pattern)
-                | Q(note__alias__name__iregex="^" + pattern)
-                | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern))
+                | Q(note__alias__name__iregex=pattern)
+                | Q(note__alias__normalized_name__iregex=Alias.normalize(pattern))
             )
 
         return qs
diff --git a/static/js/autocomplete_model.js b/static/js/autocomplete_model.js
index 9d9ba2d354bc9a85deaca60b5592323773867495..c4f9405be5c6f54b0c97bc27e127272290d33650 100644
--- a/static/js/autocomplete_model.js
+++ b/static/js/autocomplete_model.js
@@ -10,6 +10,8 @@ $(document).ready(function () {
         if (!name_field)
             name_field = "name";
         let input = target.val();
+        target.addClass("is-invalid");
+        target.removeClass("is-valid");
         $("#" + prefix + "_reset").removeClass("d-none");
 
         $.getJSON(api_url + (api_url.includes("?") ? "&" : "?") + "format=json&search=^" + input + api_url_suffix, function(objects) {
@@ -27,6 +29,10 @@ $(document).ready(function () {
                     target.val(obj[name_field]);
                     $("#" + prefix + "_pk").val(obj.id);
 
+                    results_list.html("");
+                    target.removeClass("is-invalid");
+                    target.addClass("is-valid");
+
                     if (typeof autocompleted != 'undefined')
                         autocompleted(obj, prefix)
                 });