diff --git a/backend/migrations/20240322224230_create_entities_cache.sql b/backend/migrations/20240322224230_create_entities_cache.sql
index d22203b..a4814bb 100644
--- a/backend/migrations/20240322224230_create_entities_cache.sql
+++ b/backend/migrations/20240322224230_create_entities_cache.sql
@@ -1,7 +1,29 @@
 -- Create the materialized view with a deterministic ID
 CREATE MATERIALIZED VIEW entities_caches AS
+-- Get the indexed fields for each family
+WITH families_indexed_fields AS (
+    SELECT
+        f.id AS family_id,
+        (
+            SELECT jsonb_object_agg(field->>'key', field->>'field_type')
+            FROM jsonb_array_elements(f.entity_form->'fields') AS field
+            WHERE
+                (field->>'indexed')::boolean IS TRUE
+                AND
+                (field->>'field_type')::text IN ('EnumSingleOption', 'EnumMultiOption')
+        ) AS indexed_enums,
+        (
+            SELECT jsonb_object_agg(field->>'key', field->>'field_type')
+            FROM jsonb_array_elements(f.entity_form->'fields') AS field
+            WHERE
+                (field->>'indexed')::boolean IS TRUE
+                AND
+                (field->>'field_type')::text IN ('SingleLineText', 'MultiLineText')
+        ) AS indexed_strings
+    FROM families f
+),
 -- For each location of each parent, get a row with the parent and its location flattened
-WITH transitive_locations AS (
+transitive_locations AS (
     SELECT
         ee.child_id,
         e.id AS parent_id,
@@ -27,7 +49,30 @@ direct_locations AS (
         e.hidden,
         location.value as location,
         location.ordinality AS location_index,
-        array_remove(array_agg(DISTINCT et.tag_id), NULL) AS tags_ids
+        array_remove(array_agg(DISTINCT et.tag_id), NULL) AS tags_ids,
+        COALESCE(
+            jsonb_object_agg(
+                key,
+                CASE
+                    WHEN jsonb_typeof(transformed_fields.value) = 'array' THEN transformed_fields.value
+                    ELSE 
+                        CASE
+                            WHEN transformed_fields.value IS NULL THEN '[]'::jsonb
+                            ELSE jsonb_build_array(transformed_fields.value)
+                        END
+                    END
+            ) FILTER (WHERE key IS NOT NULL),
+            '{}'::jsonb
+        )AS enums,
+        (
+            SELECT string_agg(value::text, ' ')
+            FROM jsonb_each_text(e.data)
+            WHERE key IN (
+                SELECT jsonb_object_keys(f.indexed_strings)
+                FROM families_indexed_fields f
+                WHERE f.family_id = c.family_id
+            )
+        ) AS indexed_string_values
     FROM entities e
     JOIN categories c ON e.category_id = c.id
     LEFT JOIN entity_tags et ON e.id = et.entity_id
@@ -38,6 +83,17 @@ direct_locations AS (
         SELECT value, ordinality
         FROM jsonb_array_elements(e.locations) WITH ORDINALITY AS location(value, ordinality)
     ) AS location ON true
+    LEFT JOIN LATERAL (
+        SELECT
+            key,
+            value
+        FROM jsonb_each(e.data)
+        WHERE key IN (
+            SELECT jsonb_object_keys(f.indexed_enums)
+            FROM families_indexed_fields f
+            WHERE f.family_id = c.family_id
+        )
+    ) AS transformed_fields ON true
     WHERE e.moderated
     GROUP BY e.id, c.family_id, e.display_name, e.category_id, location.value, location.ordinality
 )
@@ -57,7 +113,8 @@ SELECT
     NULL AS parent_id,
     NULL AS parent_display_name,
     dl.hidden,
-    to_tsvector(dl.display_name) AS full_text_search_ts
+    to_tsvector(dl.display_name || ' ' || COALESCE(dl.indexed_string_values, '')) AS full_text_search_ts,
+    dl.enums
 FROM direct_locations dl
 
 UNION
@@ -78,7 +135,8 @@ SELECT
     tl.parent_id,
     tl.parent_display_name,
     dl.hidden,
-    to_tsvector(dl.display_name) AS full_text_search_ts
+    to_tsvector(dl.display_name || ' ' || COALESCE(dl.indexed_string_values, '')) AS full_text_search_ts,
+    dl.enums
 FROM transitive_locations tl
 JOIN direct_locations dl ON tl.child_id = dl.entity_id;
 
@@ -88,9 +146,12 @@ CREATE UNIQUE INDEX entities_caches_id_idx ON entities_caches(id);
 -- Create indexes on the materialized view
 CREATE INDEX entities_caches_entity_id_idx ON entities_caches(entity_id);
 CREATE INDEX entities_caches_category_id_idx ON entities_caches(category_id);
+CREATE INDEX entities_caches_family_id_idx ON entities_caches(family_id);
+CREATE INDEX entities_caches_hidden_idx ON entities_caches (hidden);
+CREATE INDEX entities_caches_enums_idx ON entities_caches USING GIN (enums);
 CREATE INDEX entities_caches_gps_location_idx ON entities_caches USING GIST((ST_SetSRID(ST_MakePoint(longitude, latitude), 4326)));
 CREATE INDEX entities_caches_web_mercator_location_idx ON entities_caches USING GIST(web_mercator_location);
-CREATE INDEX entities_caches_full_text_search_idx ON entities_caches USING GIN(full_text_search_ts);
+CREATE INDEX entities_caches_full_text_search_idx ON entities_caches USING GIST(full_text_search_ts);
 
 -- Function to refresh the materialized view
 CREATE OR REPLACE FUNCTION refresh_entities_caches() RETURNS void AS $$
diff --git a/backend/migrations/20240322224255_requests_for_entities_cache.sql b/backend/migrations/20240322224255_requests_for_entities_cache.sql
index 0b1029a..e05c93b 100644
--- a/backend/migrations/20240322224255_requests_for_entities_cache.sql
+++ b/backend/migrations/20240322224255_requests_for_entities_cache.sql
@@ -17,7 +17,9 @@ CREATE OR REPLACE FUNCTION fetch_entities_within_view(
 
     active_categories_ids UUID[],
     required_tags_ids UUID[],
-    excluded_tags_ids UUID[]
+    excluded_tags_ids UUID[],
+
+    enum_constraints JSONB
 ) RETURNS TABLE (
     id UUID,
     entity_id UUID,
@@ -65,6 +67,18 @@ BEGIN
             AND (ec.category_id = ANY(active_categories_ids))
             AND (array_length(required_tags_ids, 1) = 0 OR required_tags_ids <@ ec.tags_ids)
             AND NOT (ec.tags_ids && excluded_tags_ids)
+            -- Enum constraints
+            AND (
+                enum_constraints IS NULL OR
+                enum_constraints = '{}'::jsonb OR
+                (
+                    SELECT bool_and(
+                        ec.enums->key ?| array(SELECT jsonb_array_elements_text(value))
+                    )
+                    FROM jsonb_each(enum_constraints) AS constraints(key, value)
+                    WHERE key IS NOT NULL AND ec.enums ? key
+                )
+            )
     ),
     parent_entities AS (
         SELECT
@@ -143,7 +157,9 @@ CREATE OR REPLACE FUNCTION search_entities(
     required_tags_ids UUID[],
     excluded_tags_ids UUID[],
 
-    require_locations BOOL
+    require_locations BOOL,
+
+    enum_constraints JSONB
 ) RETURNS TABLE (
     id UUID,
     entity_id UUID,
@@ -185,6 +201,18 @@ BEGIN
             AND NOT (ec.tags_ids && excluded_tags_ids)
             -- If we do not require locations, we only return entities with locations
             AND (NOT require_locations OR ec.web_mercator_location IS NOT NULL)
+            -- Enum constraints
+            AND (
+                enum_constraints IS NULL OR
+                enum_constraints = '{}'::jsonb OR
+                (
+                    SELECT bool_and(
+                        ec.enums->key ?| array(SELECT jsonb_array_elements_text(value))
+                    )
+                    FROM jsonb_each(enum_constraints) AS constraints(key, value)
+                    WHERE key IS NOT NULL AND ec.enums ? key
+                )
+            )
         ORDER BY
             ts_rank(full_text_search_ts, plainto_tsquery(search_query)) DESC,
             (ec.web_mercator_location IS NOT NULL) DESC -- prioritize entities with locations
@@ -229,7 +257,9 @@ CREATE OR REPLACE FUNCTION search_entities_admin(
 
     active_categories_ids UUID[],
     required_tags_ids UUID[],
-    excluded_tags_ids UUID[]
+    excluded_tags_ids UUID[],
+
+    enum_constraints JSONB
 ) RETURNS TABLE (
     id UUID,
     entity_id UUID,
@@ -256,8 +286,21 @@ BEGIN
             )
             AND ec.family_id = input_family_id
             AND (ec.category_id = ANY(active_categories_ids))
+            -- Categories and tags constraints
             AND (array_length(required_tags_ids, 1) = 0 OR required_tags_ids <@ ec.tags_ids)
             AND NOT (ec.tags_ids && excluded_tags_ids)
+            -- Enum constraints
+            AND (
+                enum_constraints IS NULL OR
+                enum_constraints = '{}'::jsonb OR
+                (
+                    SELECT bool_and(
+                        ec.enums->key ?| array(SELECT jsonb_array_elements_text(value))
+                    )
+                    FROM jsonb_each(enum_constraints) AS constraints(key, value)
+                    WHERE key IS NOT NULL AND ec.enums ? key
+                )
+            )
         ORDER BY
             ts_rank(full_text_search_ts, plainto_tsquery(search_query)) DESC
     ),
diff --git a/backend/src/api/admin/entities.rs b/backend/src/api/admin/entities.rs
index 073fed1..4f1d756 100644
--- a/backend/src/api/admin/entities.rs
+++ b/backend/src/api/admin/entities.rs
@@ -32,6 +32,7 @@ pub struct AdminSearchRequest {
     pub active_categories_ids: Vec<Uuid>,
     pub required_tags_ids: Vec<Uuid>,
     pub excluded_tags_ids: Vec<Uuid>,
+    pub enums_constraints: Value,
 }
 
 #[derive(FromRow, Deserialize, Serialize, ToSchema, Debug)]
@@ -84,6 +85,7 @@ pub async fn admin_entities_search(
                 active_categories_ids: search_req.active_categories_ids,
                 required_tags_ids: search_req.required_tags_ids,
                 excluded_tags_ids: search_req.excluded_tags_ids,
+                enums_constraints: search_req.enums_constraints,
             },
             &mut conn,
         )
diff --git a/backend/src/api/map.rs b/backend/src/api/map.rs
index 15bece4..1f80f57 100644
--- a/backend/src/api/map.rs
+++ b/backend/src/api/map.rs
@@ -12,6 +12,7 @@ use axum::{
     Json,
 };
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 use std::fmt::Display;
 use utoipa::ToSchema;
 use uuid::Uuid;
@@ -38,6 +39,7 @@ pub struct ViewRequest {
     active_categories: Vec<Uuid>,
     active_required_tags: Vec<Uuid>,
     active_hidden_tags: Vec<Uuid>,
+    enums_constraints: Value,
 }
 
 impl Display for ViewRequest {
@@ -125,6 +127,7 @@ pub async fn viewer_view_request(
         active_categories: request.active_categories,
         active_required_tags: request.active_required_tags,
         active_hidden_tags: request.active_hidden_tags,
+        enums_constraints: request.enums_constraints,
     };
 
     Ok(AppJson(
@@ -142,6 +145,7 @@ pub struct SearchRequest {
     active_required_tags: Vec<Uuid>,
     active_hidden_tags: Vec<Uuid>,
     require_locations: bool,
+    enums_constraints: Value,
 }
 
 impl Display for SearchRequest {
@@ -189,6 +193,7 @@ async fn viewer_search_request(
         active_required_tags: request.active_required_tags,
         active_hidden_tags: request.active_hidden_tags,
         require_locations: request.require_locations,
+        enums_constraints: request.enums_constraints,
     };
 
     Ok(AppJson(
diff --git a/backend/src/api/root.rs b/backend/src/api/root.rs
index 895fc64..4a842c4 100644
--- a/backend/src/api/root.rs
+++ b/backend/src/api/root.rs
@@ -98,7 +98,7 @@ async fn bootstrap(
 
     let signed_token = app_state.generate_token(MapUserTokenClaims {
         iat: Utc::now().timestamp() as usize,
-        exp: (Utc::now() + TimeDelta::try_minutes(1).expect("valid duration")).timestamp() as usize,
+        exp: (Utc::now() + TimeDelta::try_hours(1).expect("valid duration")).timestamp() as usize,
         perms: perms.clone(),
     });
     tracing::trace!("Generated access token");
diff --git a/backend/src/models/entity_cache.rs b/backend/src/models/entity_cache.rs
index 12c33b6..2d6c86c 100644
--- a/backend/src/models/entity_cache.rs
+++ b/backend/src/models/entity_cache.rs
@@ -2,6 +2,7 @@ use std::collections::HashMap;
 
 use crate::api::AppError;
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 use sqlx::{query_as, PgConnection};
 use utoipa::ToSchema;
 use uuid::Uuid;
@@ -202,6 +203,8 @@ pub struct FindEntitiesRequest {
     pub active_categories: Vec<Uuid>,
     pub active_required_tags: Vec<Uuid>,
     pub active_hidden_tags: Vec<Uuid>,
+
+    pub enums_constraints: Value,
 }
 
 pub struct SearchEntitiesRequest {
@@ -225,6 +228,8 @@ pub struct SearchEntitiesRequest {
     pub active_hidden_tags: Vec<Uuid>,
 
     pub require_locations: bool,
+
+    pub enums_constraints: Value,
 }
 
 impl ViewerCachedEntity {
@@ -253,7 +258,25 @@ impl ViewerCachedEntity {
                 cluster_id,
                 cluster_center_x,
                 cluster_center_y
-            FROM fetch_entities_within_view($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16)
+            FROM fetch_entities_within_view(
+                $1,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15,
+                $16,
+                $17
+            )
             "#,
             request.xmin,
             request.ymin,
@@ -270,7 +293,8 @@ impl ViewerCachedEntity {
             request.cluster_params.map(|(_, min)| min).unwrap_or(0),
             &request.active_categories,
             &request.active_required_tags,
-            &request.active_hidden_tags
+            &request.active_hidden_tags,
+            &request.enums_constraints
         )
         .fetch_all(conn)
         .await
@@ -353,7 +377,23 @@ impl ViewerCachedEntity {
                 total_results as "total_results!",
                 total_pages as "total_pages!",
                 response_current_page as "response_current_page!"
-            FROM search_entities($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14)
+            FROM search_entities(
+                $1,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8,
+                $9,
+                $10,
+                $11,
+                $12,
+                $13,
+                $14,
+                $15
+            )
             "#,
             request.search_query,
             request.family_id,
@@ -368,7 +408,8 @@ impl ViewerCachedEntity {
             &request.active_categories,
             &request.active_required_tags,
             &request.active_hidden_tags,
-            request.require_locations
+            request.require_locations,
+            &request.enums_constraints
         )
         .fetch_all(conn)
         .await
@@ -386,6 +427,7 @@ pub struct AdminSearchEntitiesRequest {
     pub active_categories_ids: Vec<Uuid>,
     pub required_tags_ids: Vec<Uuid>,
     pub excluded_tags_ids: Vec<Uuid>,
+    pub enums_constraints: Value,
 }
 
 impl AdminCachedEntity {
@@ -407,7 +449,16 @@ impl AdminCachedEntity {
                 total_pages as "total_pages!",
                 response_current_page as "response_current_page!",
                 hidden as "hidden!"
-            FROM search_entities_admin($1, $2, $3, $4, $5, $6, $7)
+            FROM search_entities_admin(
+                $1,
+                $2,
+                $3,
+                $4,
+                $5,
+                $6,
+                $7,
+                $8
+            )
             "#,
             request.search_query,
             request.family_id,
@@ -415,7 +466,8 @@ impl AdminCachedEntity {
             request.page_size,
             &request.active_categories_ids,
             &request.required_tags_ids,
-            &request.excluded_tags_ids
+            &request.excluded_tags_ids,
+            &request.enums_constraints
         )
         .fetch_all(conn)
         .await
diff --git a/frontend/components/admin/input/EntitySelect.vue b/frontend/components/admin/input/EntitySelect.vue
index 5d7af52..f6bb35e 100644
--- a/frontend/components/admin/input/EntitySelect.vue
+++ b/frontend/components/admin/input/EntitySelect.vue
@@ -89,6 +89,7 @@
       <ViewerFilterConfig
         v-model:filteringTags="tagFilteringList"
         v-model:filteringCategories="categoryFilteringList"
+        v-model:filteringEnums="enumsFilteringList"
         @filters-changed="refreshSearch"
       />
     </Popover>
@@ -97,7 +98,13 @@
 
 <script setup lang="ts">
 import type Popover from 'primevue/popover'
-import type { AdminCachedEntity, AdminPaginatedCachedEntities, Category, Tag } from '~/lib'
+import type {
+  AdminCachedEntity,
+  AdminPaginatedCachedEntities,
+  Category,
+  Tag,
+  EnumFilter,
+} from '~/lib'
 import state from '~/lib/admin-state'
 
 const props = withDefaults(defineProps<{
@@ -116,6 +123,7 @@ const filters_overlay = ref<typeof Popover>()
 const search_query = ref('')
 const categoryFilteringList = ref<(Category & { active: boolean })[]>([])
 const tagFilteringList = ref<(Tag & { active: boolean | null })[]>([])
+const enumsFilteringList: EnumFilter[] = []
 
 const currentEntitiesResults: Ref<AdminPaginatedCachedEntities | null> = ref(null)
 const chosenEntity = ref<AdminCachedEntity | { id: string | undefined }>({ id: props.previousEntityId })
@@ -136,6 +144,7 @@ async function refreshSearch() {
       active_categories_ids: categoryFilteringList!.value.filter(t => t.active).map(t => t.id),
       required_tags_ids: tagFilteringList!.value.filter(t => t.active).map(t => t.id),
       excluded_tags_ids: tagFilteringList!.value.filter(t => t.active === false).map(t => t.id),
+      enums_constraints: [], // We do not support enums filtering on Entity selection
     },
   )
 }
diff --git a/frontend/components/viewer/FilterConfig.vue b/frontend/components/viewer/FilterConfig.vue
index dccb74f..9f885f9 100644
--- a/frontend/components/viewer/FilterConfig.vue
+++ b/frontend/components/viewer/FilterConfig.vue
@@ -5,7 +5,13 @@
         Général
       </Tab>
       <Tab value="1">
-        Avancé
+        Tags
+      </Tab>
+      <Tab
+        v-if="hasFilteringEnums"
+        value="2"
+      >
+        Contraintes
       </Tab>
     </TabList>
 
@@ -167,28 +173,48 @@
           </div>
         </div>
       </TabPanel>
+
+      <TabPanel
+        v-if="hasFilteringEnums"
+        value="2"
+      >
+        <div
+          v-for="item in props.filteringEnums"
+          :key="item.key"
+        >
+          <span class="font-medium block mb-2 mt-4">{{ item.title }}</span>
+          <MultiSelect
+            v-model="item.active"
+            class="w-full"
+            :options="item.values"
+            option-label="label"
+            option-value="value"
+            @change="enumsFiltersChanged"
+          />
+        </div>
+      </TabPanel>
     </TabPanels>
   </Tabs>
 </template>
 
 <script setup lang="ts">
-import type { Category, Tag } from '~/lib'
+import type { Category, Tag, EnumFilter } from '~/lib'
 
 export interface Props {
   maximumHeight?: string
   filteringTags: (Tag & { active: boolean | null })[]
   filteringCategories: (Category & { active: boolean })[]
+  filteringEnums: EnumFilter[]
 }
 
 const props = withDefaults(defineProps<Props>(), {
   maximumHeight: '350px',
 })
 
+const hasFilteringEnums = computed(() => props.filteringEnums.length > 0)
+
 const emit = defineEmits<{
   (event: 'filtersChanged'): void
-  // update:modelValue events uneeded as props are not reassigned only mutated through references
-  // (event: 'update:modelValue:filteringCategories', categories: (Category & { active: boolean })[]): void
-  // (event: 'update:modelValue:filteringTags', tags: (Tag & { active: boolean | null })[]): void
 }>()
 
 const tagSearch = ref('')
@@ -232,6 +258,10 @@ function categoryFiltersChanged() {
   emit('filtersChanged')
 }
 
+function enumsFiltersChanged() {
+  emit('filtersChanged')
+}
+
 function resetFilters() {
   props.filteringTags.filter(t => !t.is_filter).forEach(t => t.active = null)
   tagFiltersChanged()
diff --git a/frontend/components/viewer/FullResult.vue b/frontend/components/viewer/FullResult.vue
index 42895cd..2a7de72 100644
--- a/frontend/components/viewer/FullResult.vue
+++ b/frontend/components/viewer/FullResult.vue
@@ -36,7 +36,7 @@
               </div>
             </div>
             <div
-              class="bg-surface-100 p-1"
+              class="p-1"
               style="border-radius: 30px"
             >
               {{ props.entity.plain_text_location }}
diff --git a/frontend/components/viewer/Navbar.vue b/frontend/components/viewer/Navbar.vue
index 6b8ecb4..b26cb52 100644
--- a/frontend/components/viewer/Navbar.vue
+++ b/frontend/components/viewer/Navbar.vue
@@ -179,6 +179,7 @@
     <ViewerFilterConfig
       v-model:filteringTags="state.filteringTags"
       v-model:filteringCategories="state.filteringCategories"
+      v-model:filteringEnums="state.filteringEnums"
       class="w-[25rem]"
       @filters-changed="filtersChanged"
     />
@@ -192,6 +193,7 @@
     <ViewerFilterConfig
       v-model:filteringTags="state.filteringTags"
       v-model:filteringCategories="state.filteringCategories"
+      v-model:filteringEnums="state.filteringEnums"
       @filters-changed="filtersChanged"
     />
   </Dialog>
diff --git a/frontend/lib.d.ts b/frontend/lib.d.ts
index 23100d4..5e2daa1 100644
--- a/frontend/lib.d.ts
+++ b/frontend/lib.d.ts
@@ -178,3 +178,13 @@ export type CategoryRecord = Record<string, Category>
 export type TagRecord = Record<string, Tag>
 
 export type HomePageStats = api.components['schemas']['HomePageStats']
+
+export type EnumFilter = {
+  key: string
+  title: string
+  values: {
+    label: string
+    value: string
+  }[]
+  active: string[]
+}
diff --git a/frontend/lib/admin-client.ts b/frontend/lib/admin-client.ts
index 7bc5612..3cc5972 100644
--- a/frontend/lib/admin-client.ts
+++ b/frontend/lib/admin-client.ts
@@ -201,7 +201,10 @@ export default function useClient() {
       return data
     },
 
-    async searchEntities(pagination: { page: number, page_size: number }, search_request: AdminSearchRequestBody): Promise<AdminPaginatedCachedEntities> {
+    async searchEntities(
+      pagination: { page: number, page_size: number },
+      search_request: AdminSearchRequestBody,
+    ): Promise<AdminPaginatedCachedEntities> {
       const { data, error } = await this.rawClient.POST('/api/admin/entities/search', {
         params: { query: pagination },
         body: search_request,
diff --git a/frontend/lib/admin-state.ts b/frontend/lib/admin-state.ts
index 604e2ee..607586a 100644
--- a/frontend/lib/admin-state.ts
+++ b/frontend/lib/admin-state.ts
@@ -14,6 +14,7 @@ import type {
   CategoryRecord,
   FamilyRecord,
   TagRecord,
+  EnumFilter,
 } from '~/lib'
 
 interface Identifiable {
@@ -45,6 +46,7 @@ export class AppState {
     pageSize: number
     categoryFilteringList?: (Category & { active: boolean })[]
     tagFilteringList?: (Tag & { active: boolean | null })[]
+    enumsFilteringList: EnumFilter[]
   }> = {}
 
   private compareIds(array1: Identifiable[] | null, array2: Identifiable[] | null): boolean {
@@ -129,6 +131,10 @@ export class AppState {
     return this.familiesData!
   }
 
+  familyById(id: string): Family {
+    return this.familyRecord[id]
+  }
+
   async fetchFamily(id: string) {
     return await this.client.getFamily(id)
   }
diff --git a/frontend/lib/viewer-client.ts b/frontend/lib/viewer-client.ts
index 208abe0..f082fef 100644
--- a/frontend/lib/viewer-client.ts
+++ b/frontend/lib/viewer-client.ts
@@ -54,6 +54,7 @@ export default function useClient() {
       activeCategories: string[],
       activeRequiredTags: string[],
       activeHiddenTags: string[],
+      enumsConstraints: Record<string, Array<unknown>>,
     ) {
       const { data, error } = await rawClient.POST('/api/map/view', {
         body: {
@@ -66,6 +67,7 @@ export default function useClient() {
           active_categories: activeCategories,
           active_required_tags: activeRequiredTags,
           active_hidden_tags: activeHiddenTags,
+          enums_constraints: enumsConstraints,
         },
       })
       if (error) throw error
@@ -98,6 +100,7 @@ export default function useClient() {
       activeCategories: string[],
       activeRequiredTags: string[],
       activeHiddenTags: string[],
+      enumsConstraints: Record<string, Array<unknown>>,
     ): Promise<ViewerPaginatedCachedEntitiesWithLocation> {
       const { data, error } = await rawClient.POST('/api/map/search', {
         body: {
@@ -109,6 +112,7 @@ export default function useClient() {
           active_required_tags: activeRequiredTags,
           active_hidden_tags: activeHiddenTags,
           require_locations: true,
+          enums_constraints: enumsConstraints,
         },
       })
       if (error) throw error
@@ -131,6 +135,7 @@ export default function useClient() {
       activeHiddenTags: string[],
       page: number,
       pageSize: number,
+      enumsConstraints: Record<string, Array<unknown>>,
     ): Promise<ViewerPaginatedCachedEntities> {
       const { data, error } = await rawClient.POST('/api/map/search', {
         body: {
@@ -142,6 +147,7 @@ export default function useClient() {
           active_required_tags: activeRequiredTags,
           active_hidden_tags: activeHiddenTags,
           require_locations: false,
+          enums_constraints: enumsConstraints,
         },
       })
       if (error) throw error
diff --git a/frontend/lib/viewer-state.ts b/frontend/lib/viewer-state.ts
index 74bbf47..d68bc24 100644
--- a/frontend/lib/viewer-state.ts
+++ b/frontend/lib/viewer-state.ts
@@ -12,6 +12,7 @@ import type {
   DisplayableCluster,
   FetchedEntity,
   InitConfig,
+  EnumFilter,
 } from '~/lib'
 
 type ViewData = {
@@ -54,6 +55,7 @@ export class AppState {
 
   public filteringTags: (Tag & { active: boolean | null })[] = []
   public filteringCategories: (Category & { active: boolean })[] = []
+  public filteringEnums: EnumFilter[] = []
 
   get mapSource() {
     return {
@@ -76,6 +78,15 @@ export class AppState {
     return this.filteringTags.filter(t => t.active).map(t => t.id)
   }
 
+  get activeFilteringEnums(): Record<string, string[]> {
+    return Object
+      .fromEntries(
+        this.filteringEnums
+          .filter(f => f.active.length > 0)
+          .map(f => [f.key, f.active]),
+      )
+  }
+
   get canAccessComments() {
     return this.canAccessCommentsData
   }
@@ -111,6 +122,7 @@ export class AppState {
 
   set activeFamily(family: Family) {
     this.activeFamilyId = family.id
+
     this.filteringCategories = this.categories
       .filter(c => c.family_id === family.id && c.allowed)
       .map((c) => {
@@ -119,6 +131,23 @@ export class AppState {
           active: c.default_status,
         }
       })
+
+    this.filteringEnums = family.entity_form.fields
+      .filter(f => f.indexed && (f.field_type === 'EnumMultiOption' || f.field_type === 'EnumSingleOption'))
+      .map((f) => {
+        return {
+          key: f.key,
+          title: f.display_name,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          values: (f.field_type_metadata as any).options.map((v: any) => {
+            return {
+              label: v.label,
+              value: v.value,
+            }
+          }),
+          active: [],
+        }
+      })
   }
 
   get online() {
@@ -324,6 +353,7 @@ export class AppState {
       this.activeFilteringCategories,
       this.activeRequiredTags,
       this.activeHiddenTags,
+      this.activeFilteringEnums,
     )
   }
 
@@ -336,6 +366,7 @@ export class AppState {
       this.activeHiddenTags,
       page,
       pageSize,
+      this.activeFilteringEnums,
     )
   }
 
@@ -357,6 +388,7 @@ export class AppState {
       this.activeFilteringCategories,
       this.activeRequiredTags,
       this.activeHiddenTags,
+      this.activeFilteringEnums,
     )
 
     // Step 1: Identify and filter out entities that are no longer present
diff --git a/frontend/openapi.json b/frontend/openapi.json
index 2f37781..762cdd2 100644
--- a/frontend/openapi.json
+++ b/frontend/openapi.json
@@ -3131,7 +3131,8 @@
           "search",
           "active_categories_ids",
           "required_tags_ids",
-          "excluded_tags_ids"
+          "excluded_tags_ids",
+          "enums_constraints"
         ],
         "properties": {
           "active_categories_ids": {
@@ -3141,6 +3142,7 @@
               "format": "uuid"
             }
           },
+          "enums_constraints": {},
           "excluded_tags_ids": {
             "type": "array",
             "items": {
@@ -4218,7 +4220,8 @@
           "active_categories",
           "active_required_tags",
           "active_hidden_tags",
-          "require_locations"
+          "require_locations",
+          "enums_constraints"
         ],
         "properties": {
           "active_categories": {
@@ -4242,6 +4245,7 @@
               "format": "uuid"
             }
           },
+          "enums_constraints": {},
           "family_id": {
             "type": "string",
             "format": "uuid"
@@ -4379,7 +4383,8 @@
           "zoom_level",
           "active_categories",
           "active_required_tags",
-          "active_hidden_tags"
+          "active_hidden_tags",
+          "enums_constraints"
         ],
         "properties": {
           "active_categories": {
@@ -4403,6 +4408,7 @@
               "format": "uuid"
             }
           },
+          "enums_constraints": {},
           "family_id": {
             "type": "string",
             "format": "uuid"
diff --git a/frontend/pages/admin/[familyId]/entities/index.vue b/frontend/pages/admin/[familyId]/entities/index.vue
index 3074f61..537442f 100644
--- a/frontend/pages/admin/[familyId]/entities/index.vue
+++ b/frontend/pages/admin/[familyId]/entities/index.vue
@@ -131,6 +131,7 @@
       <ViewerFilterConfig
         v-model:filteringTags="state.tablesQueryParams[table_key].tagFilteringList!"
         v-model:filteringCategories="state.tablesQueryParams[table_key].categoryFilteringList!"
+        v-model:filteringEnums="state.tablesQueryParams[table_key].enumsFilteringList!"
         class="w-[25rem]"
         @filters-changed="refreshTable"
       />
@@ -182,6 +183,22 @@ if (!(table_key in state.tablesQueryParams)) {
       .filter(category => category.family_id == familyId)
       .map(category => ({ ...category, active: true })),
     tagFilteringList: state.tags.map(tag => ({ ...tag, active: null })),
+    enumsFilteringList: state.familyById(familyId).entity_form.fields
+      .filter(f => f.indexed && (f.field_type === 'EnumMultiOption' || f.field_type === 'EnumSingleOption'))
+      .map((f) => {
+        return {
+          key: f.key,
+          title: f.display_name,
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          values: (f.field_type_metadata as any).options.map((v: any) => {
+            return {
+              label: v.label,
+              value: v.value,
+            }
+          }),
+          active: [],
+        }
+      }),
   }
 }
 else {
@@ -213,6 +230,12 @@ async function refreshTable() {
       active_categories_ids: state.tablesQueryParams[table_key].categoryFilteringList!.filter(t => t.active).map(t => t.id),
       required_tags_ids: state.tablesQueryParams[table_key].tagFilteringList!.filter(t => t.active).map(t => t.id),
       excluded_tags_ids: state.tablesQueryParams[table_key].tagFilteringList!.filter(t => t.active === false).map(t => t.id),
+      enums_constraints: Object
+        .fromEntries(
+          state.tablesQueryParams[table_key].enumsFilteringList!
+            .filter(f => f.active.length > 0)
+            .map(f => [f.key, f.active]),
+        ),
     },
   )
 }
diff --git a/frontend/pages/search/[token].vue b/frontend/pages/search/[token].vue
index 50b8503..2b61c13 100644
--- a/frontend/pages/search/[token].vue
+++ b/frontend/pages/search/[token].vue
@@ -183,6 +183,7 @@
       <ViewerFilterConfig
         v-model:filteringTags="state.filteringTags"
         v-model:filteringCategories="state.filteringCategories"
+        v-model:filteringEnums="state.filteringEnums"
       />
     </Dialog>
 
@@ -271,7 +272,11 @@ async function showCriteriasModal() {
 </script>
 
 <style>
-html, body {
+html:not(.sh-dark) {
   background-color: #f7f7f7;
 }
+
+html.sh-dark {
+  background-color: #282828;
+}
 </style>