diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug
index 2cf0519..9aae27b 100644
--- a/src/views/partials/admin/page-admin-circles.pug
+++ b/src/views/partials/admin/page-admin-circles.pug
@@ -22,13 +22,14 @@ div.segment.full.padding-large.padding-top-medium.padding-bottom-xsmall.sm-paddi
 
   solid-form-search.form.search-form.search-button(
     id=`admin-circle-filter-${page}`
-    fields='name'
-    label-name=''
-    widget-name='solid-form-label-text'
-    class-name="segment margin-bottom-medium sm-margin-bottom-none third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
+    fields='searchname'
+    search-searchname='name, circle.name'
+    label-searchname=''
+    widget-searchname='solid-form-label-text'
+    class-searchname="segment margin-bottom-medium sm-margin-bottom-none third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
     submit-button=""
     submit-widget="button"
-    data-trans='label-name=circle.list.searchBy;submit-button=circle.list.searchButton'
+    data-trans='label-searchname=circle.list.searchBy;submit-button=circle.list.searchButton'
   )
 
   ul(class='segment full margin-top-xsmall sm-margin-top-none sm-padding-none whitespace-normal tabs text-disable-selection')
@@ -41,6 +42,7 @@ div.segment.full.padding-large.padding-top-medium.padding-bottom-xsmall.sm-paddi
           data-src=`${getComponent('circles').endpoints.get}joinable/`
           fields=""
           counter-template="(${counter})"
+          filtered-by=`admin-circle-filter-${page}`
         )
     li(class='segment sm-full text-xlarge text-color-heading text-letter-spacing-large margin-left-medium sm-margin-left-none')
       solid-link(class='segment sm-full sm-padding-xsmall tab' next=`admin-${getRoute('circles', true)}-leave`)&attributes({'class': page == 'leave' ? 'active' : false})
@@ -52,4 +54,5 @@ div.segment.full.padding-large.padding-top-medium.padding-bottom-xsmall.sm-paddi
           nested-field="circles"
           fields=""
           counter-template="(${counter})"
+          filtered-by=`admin-circle-filter-${page}`
         )