diff --git a/configs/app.config.ts b/configs/app.config.ts
index 5c8df770..f4609ebb 100644
--- a/configs/app.config.ts
+++ b/configs/app.config.ts
@@ -175,6 +175,47 @@ const wayf = {
   ] as { name: string, entityID: string }[],
 }
 
+/**
+ * These are due to temporary constraints
+ * in the future, all features will be enabled and the settings will be deleted.
+ */
+const features = {
+  /** repositories feature flags */
+  repositories: {
+    /**
+     * If true, the search will be performed on the server side.
+     * If false, the search will be performed on the client (browser) side.
+     */
+    'server-search': false,
+
+    /** Whether to allow sorting columns */
+    'sort-columns': false,
+  },
+  /** groups feature flags */
+  groups: {
+    /** Whether to allow sorting columns */
+    'sort-columns': false,
+  },
+  /** users feature flags */
+  users: {
+    /** Whether to allow filters to be applied at the same time for both roles and groups */
+    'filter-by-both-role-group': false,
+    /** Whether to allow the last modified filter */
+    'filter-by-last-modified': false,
+    /** Whether to allow the search by username only */
+    'search-only-username': true,
+    /** Whether to allow sorting columns */
+    'sort-columns': false,
+    /** Whether to display file upload button */
+    'file-upload': false,
+  },
+  /** history feature flags */
+  history: {
+    /** Whether to display history upload tab */
+    upload: false,
+  },
+}
+
 export default {
   /** Server hostname of this application */
   serverName,
@@ -192,4 +233,10 @@ export default {
   polling,
   /** WAYF (Embedded DS) configuration */
   wayf,
+  /**
+   * Feature flags configuration. \
+   * These are due to temporary constraints
+   * in the future, all features will be enabled and the settings will be deleted.
+   */
+  features,
 }
diff --git a/configs/server.config.toml b/configs/server.config.toml
index 6e185bde..94918c43 100644
--- a/configs/server.config.toml
+++ b/configs/server.config.toml
@@ -237,3 +237,15 @@ url = "amqp://guest:guest@rabbitmq:5672//"
 
 # user name of the developer account.
 # user_name = ""
+
+
+# Feature flags for enabling or disabling application features.
+# These are due to temporary constraints
+# in the future, all features will be enabled and the settings will be deleted.
+[features]
+# Whether user search by user name only in users.
+# If false, Enable search by username, email, or ePPN.
+search_only_username = true
+
+# Whether mAP Core API bulk operation is enabled or disabled.
+enable_bulk_operation = false
diff --git a/src/app/components/group/GroupForm.vue b/src/app/components/group/GroupForm.vue
index a0b888fa..56c9bcb5 100644
--- a/src/app/components/group/GroupForm.vue
+++ b/src/app/components/group/GroupForm.vue
@@ -14,7 +14,10 @@ const emit = defineEmits<{
   'cancel': []
 }>()
 
-const { table: { pageSize } } = useAppConfig()
+const {
+  table: { pageSize },
+  features: { repositories: { 'server-search': serverSearch } },
+} = useAppConfig()
 const { schema, getMaxIdLength } = useGroupSchema(() => properties.mode)
 const { handleFormError } = useFormError()
 
@@ -51,6 +54,7 @@ const {
     label: repository.serviceName,
     value: repository.id,
   }),
+  server: serverSearch,
 })
 setupRepoScroll(repositorySelect)
 
@@ -96,7 +100,8 @@ const onCancel = () => {
         v-model="state.repository as { label: string, value: string }"
         v-model:search-term="repoSearchTerm" size="xl"
         :placeholder="$t('group.placeholder.repository')"
-        :items="repositoryNames" :loading="repoSearchStatus === 'pending'" ignore-filter
+        :items="repositoryNames" :loading="repoSearchStatus === 'pending'"
+        :ignore-filter="serverSearch"
         :ui="{ base: 'w-full' }" :disabled="mode !== 'new'"
         @update:open="onRepoOpen"
       />
diff --git a/src/app/components/history/HistoryFilter.vue b/src/app/components/history/HistoryFilter.vue
index 4113213e..b510145b 100644
--- a/src/app/components/history/HistoryFilter.vue
+++ b/src/app/components/history/HistoryFilter.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+const { features: { repositories: { 'server-search': serverSearch } } } = useAppConfig()
+
 const {
   tab,
   criteria: {
@@ -106,7 +108,8 @@ const { repositoryFilter, groupFilter, userFilter, operatorFilter }
   <div class="grid grid-cols-1 md:grid-cols-3 gap-4 mt-4">
     <USelectMenu
       ref="repositorySelect"
-      v-model:search-term="repositoryFilter.searchTerm.value" ignore-filter
+      v-model:search-term="repositoryFilter.searchTerm.value"
+      :ignore-filter="serverSearch"
       :placeholder="repositoryFilter.placeholder"
       :icon="repositoryFilter.icon" :items="repositoryFilter.items"
       :multiple="repositoryFilter.multiple" :loading="repositoryFilter.loading" clear
diff --git a/src/app/components/user/UserForm.vue b/src/app/components/user/UserForm.vue
index d4a74ad4..110b99aa 100644
--- a/src/app/components/user/UserForm.vue
+++ b/src/app/components/user/UserForm.vue
@@ -14,7 +14,10 @@ const emit = defineEmits<{
   'cancel': []
 }>()
 
-const { table: { pageSize } } = useAppConfig()
+const {
+  table: { pageSize },
+  features: { repositories: { 'server-search': serverSearch } },
+} = useAppConfig()
 const { currentUser } = useAuth()
 const { schema } = useUserSchema(() => properties.mode)
 const { preferredLanguageOptions, userRoleOptions } = useUserFormOptions()
@@ -52,6 +55,7 @@ const {
     label: repository.serviceName,
     value: repository.id,
   }),
+  server: serverSearch,
 })
 setupRepoScroll(repositorySelect)
 
@@ -353,7 +357,8 @@ const isSelf = computed(() =>
           v-model="state.repositoryRoles[index] as { label: string, value: string }"
           v-model:search-term="repoSearchTerm" size="xl"
           :placeholder="$t('user.placeholder.repository-name')"
-          :items="repositoryNames" :loading="repoSearchStatus === 'pending'" ignore-filter
+          :items="repositoryNames" :loading="repoSearchStatus === 'pending'"
+          :ignore-filter="serverSearch"
           class="flex-2"
           @update:open="onRepoOpen"
         />
diff --git a/src/app/composables/forms.ts b/src/app/composables/forms.ts
index 4cc8aa34..cd144aa7 100644
--- a/src/app/composables/forms.ts
+++ b/src/app/composables/forms.ts
@@ -26,6 +26,7 @@ const useSelectMenuInfiniteScroll = <T>(
     debounce = 300,
     scrollDistance = 10,
     query = {},
+    server = true,
   } = options
 
   const page = ref(1)
@@ -41,10 +42,11 @@ const useSelectMenuInfiniteScroll = <T>(
       ...query,
       q: searchTermDebounced.value || undefined,
       p: page.value,
-      l: limit,
+      l: server ? limit : -1,
     })),
     lazy: true,
     immediate: false,
+    watch: false,
   })
 
   watch(data, (newData) => {
@@ -57,6 +59,7 @@ const useSelectMenuInfiniteScroll = <T>(
   })
 
   watch(searchTermDebounced, () => {
+    if (!server) return
     page.value = 1
     hasMore.value = true
     execute()
diff --git a/src/app/composables/groups.ts b/src/app/composables/groups.ts
index f49971c2..fbd79913 100644
--- a/src/app/composables/groups.ts
+++ b/src/app/composables/groups.ts
@@ -15,7 +15,11 @@ const useGroupsTable = () => {
   const { t: $t } = useI18n()
   const { copy } = useClipboard()
 
-  const { table: { pageSize: pageSizeConfig } } = useAppConfig()
+  const {
+    table: { pageSize: pageSizeConfig },
+    features: { groups: { 'sort-columns': sortColumns },
+      repositories: { 'server-search': serverSearch } },
+  } = useAppConfig()
 
   const query = computed<GroupsSearchQuery>(() => normalizeGroupsQuery(route.query))
   const updateQuery = async (newQuery: Partial<GroupsSearchQuery>) => {
@@ -170,11 +174,15 @@ const useGroupsTable = () => {
     },
     {
       accessorKey: 'id',
-      header: () => sortableHeader('id'),
+      header: () => sortColumns
+        ? sortableHeader('id')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.id),
     },
     {
       accessorKey: 'displayName',
-      header: () => sortableHeader('displayName'),
+      header: () => sortColumns
+        ? sortableHeader('displayName')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.displayName),
       cell: ({ row }) => {
         const name: string = row.original.displayName
         return h(ULink, {
@@ -188,14 +196,19 @@ const useGroupsTable = () => {
     },
     {
       accessorKey: 'public',
-      header: () => sortableHeader('public'),
+      header: () => sortColumns
+        ? sortableHeader('public')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.public),
       cell: ({ row }) => (
         publicStatus.value[`${row.original.public}`]
       ),
     },
     {
       accessorKey: 'memberListVisibility',
-      header: () => sortableHeader('memberListVisibility'),
+      header: () => sortColumns
+        ? sortableHeader('memberListVisibility')
+        : h('span', { class: 'text-xs text-default font-medium' },
+            columnNames.value.memberListVisibility),
       cell: ({ row }) => (
         visibilityStatus.value[row.original.memberListVisibility]
       ),
@@ -315,6 +328,7 @@ const useGroupsTable = () => {
     } = useSelectMenuInfiniteScroll<RepositorySummary>({
       url: repositorySelect.url,
       limit: pageSizeConfig.repositories[0],
+      server: serverSearch,
       transform: repository => ({
         label: repository.serviceName,
         value: repository.id,
diff --git a/src/app/composables/repositories.ts b/src/app/composables/repositories.ts
index b736e821..b7bbd4ca 100644
--- a/src/app/composables/repositories.ts
+++ b/src/app/composables/repositories.ts
@@ -6,6 +6,8 @@ import { UButton, UDropdownMenu, UIcon, ULink } from '#components'
 
 import type { ButtonProps, DropdownMenuItem, TableColumn, TableRow } from '@nuxt/ui'
 
+const { features: { repositories: { 'sort-columns': sortColumns } } } = useAppConfig()
+
 /** Composable for managing repositories table */
 const useRepositoriesTable = () => {
   const route = useRoute()
@@ -68,12 +70,17 @@ const useRepositoriesTable = () => {
   const columns = computed<RepositoryTableColumn[]>(() => [
     {
       accessorKey: 'id',
-      header: () => sortableHeader('id'),
+      header: () => sortColumns
+        ? sortableHeader('id')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.id),
       cell: ({ row }) => row.original.spConnectorId,
+      enableGlobalFilter: false,
     },
     {
       accessorKey: 'serviceName',
-      header: () => sortableHeader('serviceName'),
+      header: () => sortColumns
+        ? sortableHeader('serviceName')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.serviceName),
       cell: ({ row }) => {
         const name: string = row.original.serviceName
         return h(ULink, {
@@ -87,7 +94,9 @@ const useRepositoriesTable = () => {
     },
     {
       accessorKey: 'serviceUrl',
-      header: () => sortableHeader('serviceUrl'),
+      header: () => sortColumns
+        ? sortableHeader('serviceUrl')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.serviceUrl),
       cell: ({ row }) => {
         const url: string = row.original.serviceUrl
         return url
@@ -109,7 +118,10 @@ const useRepositoriesTable = () => {
     },
     {
       accessorKey: 'entityIds',
-      header: () => sortableHeader('entityIds'),
+      accessorFn: row => row.entityIds?.[0],
+      header: () => sortColumns
+        ? sortableHeader('entityIds')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.entityIds),
       cell: ({ row }) => row.original.entityIds?.[0],
       meta: {
         class: {
diff --git a/src/app/composables/useHistory.ts b/src/app/composables/useHistory.ts
index b5eb6d80..c3af4018 100644
--- a/src/app/composables/useHistory.ts
+++ b/src/app/composables/useHistory.ts
@@ -381,7 +381,10 @@ const useHistory = () => {
 }
 
 const useHistoryFilter = () => {
-  const { table: { pageSize: pageSizeConfig } } = useAppConfig()
+  const {
+    table: { pageSize: pageSizeConfig },
+    features: { repositories: { 'server-search': serverSearch } },
+  } = useAppConfig()
   const { t: $t } = useI18n()
 
   const { query, updateQuery, tab } = useHistory()
@@ -416,6 +419,7 @@ const useHistoryFilter = () => {
     } = useSelectMenuInfiniteScroll<RepositorySummary>({
       url: repositorySelect.url,
       limit: pageSizeConfig.repositories[0],
+      server: serverSearch,
       transform: repository => ({
         label: repository.serviceName,
         value: repository.id,
diff --git a/src/app/composables/users.ts b/src/app/composables/users.ts
index d377b037..983977ab 100644
--- a/src/app/composables/users.ts
+++ b/src/app/composables/users.ts
@@ -18,7 +18,11 @@ const useUsersTable = () => {
   const { t: $t } = useI18n()
   const { copy } = useClipboard()
 
-  const { table: { pageSize: pageSizeConfig } } = useAppConfig()
+  const {
+    table: { pageSize: pageSizeConfig },
+    features: { users: { 'sort-columns': sortColumns, 'file-upload': fileUpload },
+      repositories: { 'server-search': serverSearch } },
+  } = useAppConfig()
 
   /** Reactive query object */
   const query = computed<UsersSearchQuery>(() => normalizeUsersQuery(route.query))
@@ -35,8 +39,8 @@ const useUsersTable = () => {
   const searchTerm = ref(query.value.q)
   const specifiedIds = ref(query.value.i)
   const specifiedRepos = ref(query.value.r)
-  const specifiedGroups = ref(query.value.g)
-  const specifiedRoles = ref(query.value.a)
+  const specifiedGroups = computed(() => query.value.g)
+  const specifiedRoles = computed(() => query.value.a)
   const startDate = ref(query.value.s)
   const endDate = ref(query.value.e)
   const sortKey = computed(() => query.value.k)
@@ -113,22 +117,32 @@ const useUsersTable = () => {
   }))
 
   /** Returns action buttons for a user entry */
-  const creationButtons = computed<[ButtonProps, ...ButtonProps[]]>(() => [
-    {
-      icon: 'i-lucide-user-plus',
-      label: $t('button.create-new'),
-      to: '/users/new',
-      color: 'primary',
-      variant: 'solid',
-    },
-    {
-      icon: 'i-lucide-file-up',
-      label: $t('button.upload'),
-      to: '/bulk',
-      color: 'primary',
-      variant: 'solid',
-    },
-  ])
+  const creationButtons = computed<[ButtonProps, ...ButtonProps[]]>(() => fileUpload
+    ? [
+        {
+          icon: 'i-lucide-user-plus',
+          label: $t('button.create-new'),
+          to: '/users/new',
+          color: 'primary',
+          variant: 'solid',
+        },
+        {
+          icon: 'i-lucide-file-up',
+          label: $t('button.upload'),
+          to: '/bulk',
+          color: 'primary',
+          variant: 'solid',
+        },
+      ]
+    : [
+        {
+          icon: 'i-lucide-user-plus',
+          label: $t('button.create-new'),
+          to: '/users/new',
+          color: 'primary',
+          variant: 'solid',
+        },
+      ])
 
   /** Actions to display when the list is empty */
   const emptyActions = computed<[ButtonProps, ...ButtonProps[]]>(() => [
@@ -210,11 +224,15 @@ const useUsersTable = () => {
     },
     {
       accessorKey: 'id',
-      header: () => sortableHeader('id'),
+      header: () => sortColumns
+        ? sortableHeader('id')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.id),
     },
     {
       accessorKey: 'userName',
-      header: () => sortableHeader('userName'),
+      header: () => sortColumns
+        ? sortableHeader('userName')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.userName),
       cell: ({ row }) => {
         const name = row.original.userName
         const role = camelCase(row.original.role!)
@@ -266,17 +284,23 @@ const useUsersTable = () => {
     },
     {
       accessorKey: 'emails',
-      header: () => sortableHeader('emails'),
+      header: () => sortColumns
+        ? sortableHeader('emails')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.emails),
       cell: ({ row }) => row.original.emails?.[0] ?? '',
     },
     {
       accessorKey: 'eppns',
-      header: () => sortableHeader('eppns'),
+      header: () => sortColumns
+        ? sortableHeader('eppns')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.eppns),
       cell: ({ row }) => row.original.eppns?.[0] ?? '',
     },
     {
       accessorKey: 'lastModified',
-      header: () => sortableHeader('lastModified'),
+      header: () => sortColumns
+        ? sortableHeader('lastModified')
+        : h('span', { class: 'text-xs text-default font-medium' }, columnNames.value.lastModified),
       cell: ({ row }) =>
         row.original.lastModified
           ? datetimeFormatter.format(new Date(row.original.lastModified))
@@ -405,6 +429,7 @@ const useUsersTable = () => {
     } = useSelectMenuInfiniteScroll<RepositorySummary>({
       url: repositorySelect.url,
       limit: pageSizeConfig.repositories[0],
+      server: serverSearch,
       transform: repository => ({
         label: repository.serviceName,
         value: repository.id,
@@ -507,6 +532,14 @@ const useUsersTable = () => {
     })
   }
 
+  const isRoleFilterActive = computed(() => {
+    return specifiedRoles.value && specifiedRoles.value.length > 0
+  })
+
+  const isGroupFilterActive = computed(() => {
+    return specifiedGroups.value && specifiedGroups.value.length > 0
+  })
+
   return {
     /** Computed reference for the current query */
     query,
@@ -570,6 +603,10 @@ const useUsersTable = () => {
     },
     /** Make indicator for the page information */
     makePageInfo,
+    /** Indicator for whether the group filter is active */
+    isGroupFilterActive,
+    /** Indicator for whether the role filter is active */
+    isRoleFilterActive,
     /** Reactive object for the state of modals */
     modals,
   }
diff --git a/src/app/i18n/locales/en.json b/src/app/i18n/locales/en.json
index 4aa0724e..ba471269 100644
--- a/src/app/i18n/locales/en.json
+++ b/src/app/i18n/locales/en.json
@@ -206,8 +206,8 @@
         "public": "Public Status",
         "users-count": "Users"
       },
+      "search-placeholder": "Search by group name...",
       "no-groupss-description": "Your repository does not have any groups. Please create a group first.",
-      "search-placeholder": "Seach...",
       "title": "Groups List"
     },
     "title": "Groups"
@@ -332,6 +332,8 @@
       },
       "no-repositories-description": "you have no repositories to manage",
       "no-repositories-title": "No repositories found",
+      "search-placeholder": "Search by repository name, URL, EntityID...",
+      "search-placeholder-service-name-only": "Search by repository name...",
       "title": "Repositories List"
     },
     "title": "Repositories",
@@ -598,6 +600,10 @@
     }
   },
   "users": {
+    "alert": {
+      "filter-by-both-role-group-disabled": "Currently, due to limited functionality, it is not possible to select role and group filters at the same time.",
+      "filter-by-last-modified-disabled": "Due to limited functionality, filtering by last updated time is currently not available."
+    },
     "all-users-actions": "All users",
     "button": {
       "all-users-download": "Download all users",
@@ -626,7 +632,8 @@
       },
       "no-users-description": "Your repository does not have any users. Please create a user or upload a file first.",
       "no-users-title": "No users found",
-      "search-placeholder": "Search...",
+      "search-placeholder": "Search by username, email, ePPN...",
+      "search-placeholder-username-only": "Search by username...",
       "title": "Users List"
     },
     "title": "Users"
diff --git a/src/app/i18n/locales/ja.json b/src/app/i18n/locales/ja.json
index 74f54442..c12c9715 100644
--- a/src/app/i18n/locales/ja.json
+++ b/src/app/i18n/locales/ja.json
@@ -192,8 +192,8 @@
         "public": "グループの公開状態",
         "users-count": "ユーザー数"
       },
+      "search-placeholder": "グループ名で検索...",
       "no-groupss-description": "あなたのリポジトリにはグループがありません。まずはグループを作成してください。",
-      "search-placeholder": "検索...",
       "title": "グループ一覧"
     },
     "title": "グループ"
@@ -317,6 +317,8 @@
       },
       "no-repositories-description": "あなたには管理できるリポジトリがありません",
       "no-repositories-title": "リポジトリが見つかりません",
+      "search-placeholder": "リポジトリ名、URL、EntityIDで検索...",
+      "search-placeholder-service-name-only": "リポジトリ名で検索...",
       "title": "リポジトリ一覧"
     },
     "title": "リポジトリ",
@@ -569,6 +571,10 @@
     }
   },
   "users": {
+    "alert": {
+      "filter-by-both-role-group-disabled": "現在、機能が制限されているため、ロールとグループのフィルターを同時に選択することができません。",
+      "filter-by-last-modified-disabled": "現在、機能が制限されているため、最終更新日時によるフィルターはご利用いただけません。"
+    },
     "all-users-actions": "すべてのユーザー",
     "button": {
       "all-users-download": "全件ダウンロード",
@@ -595,7 +601,8 @@
       },
       "no-users-description": "あなたのリポジトリにはユーザーがいません。まずはユーザーを作成するか、ファイルをアップロードしてください。",
       "no-users-title": "ユーザーが見つかりません",
-      "search-placeholder": "検索...",
+      "search-placeholder": "ユーザー名、Email、ePPN で検索...",
+      "search-placeholder-username-only": "ユーザー名で検索...",
       "title": "ユーザー一覧"
     },
     "title": "ユーザー"
diff --git a/src/app/pages/groups/index.vue b/src/app/pages/groups/index.vue
index 795ed6dd..31fb8099 100644
--- a/src/app/pages/groups/index.vue
+++ b/src/app/pages/groups/index.vue
@@ -9,7 +9,9 @@ const {
 const { searchTerm, pageNumber, pageSize } = criteria
 
 const table = useTemplateRef('table')
-const { table: { pageSize: { groups: pageOptions } } } = useAppConfig()
+const { table: { pageSize: { groups: pageOptions } },
+  features: { repositories: { 'server-search': serverSearch } },
+} = useAppConfig()
 
 const { handleFetchError } = useErrorHandling()
 const { data: searchResult, status, refresh } = useFetch<GroupsSearchResult>('/api/groups', {
@@ -194,7 +196,8 @@ const onDelete = async () => {
     <template #content>
       <USelectMenu
         ref="repositorySelect"
-        v-model:search-term="repositoryFilter.searchTerm.value" ignore-filter
+        v-model:search-term="repositoryFilter.searchTerm.value"
+        :ignore-filter="serverSearch"
         :placeholder="repositoryFilter.placeholder"
         :icon="repositoryFilter.icon" :items="repositoryFilter.items"
         :multiple="repositoryFilter.multiple" :loading="repositoryFilter.loading"
diff --git a/src/app/pages/history/index.vue b/src/app/pages/history/index.vue
index a4dcb225..a07aa56e 100644
--- a/src/app/pages/history/index.vue
+++ b/src/app/pages/history/index.vue
@@ -6,11 +6,18 @@ const {
   tab, uploadColumns, downloadColumns, isFileAvailable,
 } = useHistory()
 
-const tabItems = computed<TabsItem[]>(() => [
-  { label: $t('history.tab.download'), icon: 'i-lucide-download', slot: 'download',
-    value: 'download' },
-  { label: $t('history.tab.upload'), icon: 'i-lucide-upload', slot: 'upload', value: 'upload' },
-])
+const { features: { history: { upload: fileUpload } } } = useAppConfig()
+
+const tabItems = computed<TabsItem[]>(() => fileUpload
+  ? [
+      { label: $t('history.tab.download'), icon: 'i-lucide-download', slot: 'download',
+        value: 'download' },
+      { label: $t('history.tab.upload'), icon: 'i-lucide-upload', slot: 'upload', value: 'upload' },
+    ]
+  : [
+      { label: $t('history.tab.download'), icon: 'i-lucide-download', slot: 'download',
+        value: 'download' },
+    ])
 
 const { handleFetchError } = useErrorHandling()
 const { data } = useFetch<DownloadApiModel | UploadApiModel>(`/api/history/${tab.value}`, {
@@ -75,7 +82,7 @@ const handleAction = async (action: string, row: ActionRow) => {
   <UPageHeader
     :title="$t('history.title')"
     :description="$t('history.description')"
-    :ui="{ root: 'py-2', description: 'mt-2' }"
+    :ui="{ root: 'py-2 mb-6', description: 'mt-2' }"
   />
   <UTabs
     v-model="activeTab"
@@ -85,7 +92,7 @@ const handleAction = async (action: string, row: ActionRow) => {
     :ui="{ trigger: 'min-w-50' }"
   >
     <template #download>
-      <div class="container mx-auto px-4">
+      <div class="container mx-auto px-4  space-y-4">
         <HistoryFilter target="download" />
 
         <div v-if="loading" class="text-center text-sm text-muted">
@@ -108,7 +115,7 @@ const handleAction = async (action: string, row: ActionRow) => {
     </template>
 
     <template #upload>
-      <div class="container mx-auto px-4">
+      <div class="container mx-auto px-4  space-y-4">
         <HistoryFilter target="upload" />
 
         <div v-if="loading" class="text-center text-sm text-muted">
diff --git a/src/app/pages/repositories/index.vue b/src/app/pages/repositories/index.vue
index d7b6f463..56803fff 100644
--- a/src/app/pages/repositories/index.vue
+++ b/src/app/pages/repositories/index.vue
@@ -11,14 +11,25 @@ const {
 const { searchTerm, pageNumber, pageSize } = criteria
 
 const table = useTemplateRef('table')
-const { table: { pageSize: { repositories: pageOptions } } } = useAppConfig()
+const {
+  table: { pageSize: { repositories: pageOptions } },
+  features: { repositories: { 'server-search': serverSearch } },
+} = useAppConfig()
+const serverQuery = computed(() => {
+  if (serverSearch) return query.value
 
+  const { q, l, ...remain } = query.value
+  return {
+    ...remain,
+    l: -1,
+  }
+})
 const { handleFetchError } = useErrorHandling()
 const {
   data: searchResult, status, refresh,
 } = useFetch<RepositoriesSearchResult>('/api/repositories', {
   method: 'GET',
-  query,
+  query: serverQuery,
   onResponseError({ response }) {
     switch (response.status) {
       case 400: {
@@ -74,7 +85,12 @@ const pageInfo = makePageInfo(searchResult)
 
   <div class="grid grid-cols-3 gap-4 my-4 h-8">
     <UInput
-      v-model="searchTerm" :placeholder="$t('users.table.search-placeholder')"
+      v-model="searchTerm"
+      :placeholder="
+        serverSearch || tableView
+          ? $t('repositories.table.search-placeholder')
+          : $t('repositories.table.search-placeholder-service-name-only')
+      "
       icon="i-lucide-search" :ui="{ trailing: 'pe-1.5' }"
       @keydown.enter="() => updateQuery({ q: searchTerm, p: 1 })"
     >
@@ -133,7 +149,7 @@ const pageInfo = makePageInfo(searchResult)
   <div v-if="tableView">
     <UTable
       ref="table"
-      v-model:column-visibility="columnVisibility"
+      v-model:column-visibility="columnVisibility" v-model:global-filter="searchTerm"
       :loading="status === 'pending'"
       :data="searchResult?.resources" :columns="columns" :ui="{ root: 'mb-8' }"
     >
@@ -148,7 +164,13 @@ const pageInfo = makePageInfo(searchResult)
   </div>
   <div v-else class="grid grid-cols-3 gap-4">
     <UPageCard
-      v-for="item in searchResult?.resources" :key="item.id"
+      v-for="
+        item in searchResult?.resources.filter(
+          repo => serverSearch
+            || !searchTerm
+            || repo.serviceName.toLowerCase().includes(searchTerm.toLowerCase()),
+        )
+      " :key="item.id"
       :ui="{ root: 'p-4 cursor-pointer', title: 'hover:underline' }"
     >
       <template #title>
diff --git a/src/app/pages/users/index.vue b/src/app/pages/users/index.vue
index 25862e69..024d343f 100644
--- a/src/app/pages/users/index.vue
+++ b/src/app/pages/users/index.vue
@@ -8,12 +8,18 @@ const {
   toggleSelection, selectedCount, getSelected, clearSelection, selectedUsersActions,
   columns, columnNames, columnVisibility,
   makeAttributeFilters, dateFilter: { dateRange, formattedDateRange }, makePageInfo, modals,
+  isRoleFilterActive, isGroupFilterActive,
 } = useUsersTable()
 
 const { searchTerm, pageNumber, pageSize } = criteria
 
 const table = useTemplateRef('table')
-const { table: { pageSize: { users: pageOptions } } } = useAppConfig()
+const { table: { pageSize: { users: pageOptions } },
+  features: { users: { 'filter-by-last-modified': filterByLastModified,
+    'filter-by-both-role-group': filterByBoth,
+    'search-only-username': sercheOnlyUserName },
+  repositories: { 'server-search': serverSearch } },
+} = useAppConfig()
 
 const { handleFetchError } = useErrorHandling()
 const { data: searchResult, status, refresh } = useFetch<UsersSearchResult>('/api/users', {
@@ -217,7 +223,12 @@ const onRemove = async (event: FormSubmitEvent<typeof userOpState>) => {
 
   <div class="grid grid-cols-3 gap-4 my-4 h-8">
     <UInput
-      v-model="searchTerm" :placeholder="$t('users.table.search-placeholder')"
+      v-model="searchTerm"
+      :placeholder="
+        sercheOnlyUserName
+          ? $t('users.table.search-placeholder-username-only')
+          : $t('users.table.search-placeholder')
+      "
       icon="i-lucide-search" :ui="{ trailing: 'pe-1.5' }"
       @keydown.enter="() => updateQuery({ q: searchTerm, p: 1 })"
     >
@@ -286,33 +297,74 @@ const onRemove = async (event: FormSubmitEvent<typeof userOpState>) => {
     <template #content>
       <USelectMenu
         ref="repositorySelect"
-        v-model:search-term="repositoryFilter.searchTerm.value" ignore-filter
+        v-model:search-term="repositoryFilter.searchTerm.value"
+        :ignore-filter="serverSearch"
         :placeholder="repositoryFilter.placeholder"
         :icon="repositoryFilter.icon" :items="repositoryFilter.items"
         :multiple="repositoryFilter.multiple" :loading="repositoryFilter.loading"
         @update:open="repositoryFilter.onOpen" @update:model-value="repositoryFilter.onUpdated"
       />
-      <USelectMenu
-        :search-input="false"
-        :placeholder="roleFilter.placeholder"
-        :icon="roleFilter.icon" :items="roleFilter.items"
-        :multiple="roleFilter.multiple" :loading="filterOptionsStatus === 'pending'"
-        @update:model-value="roleFilter.onUpdated"
-      />
-      <USelectMenu
-        ref="groupSelect"
-        v-model:search-term="groupFilter.searchTerm.value" ignore-filter
-        :placeholder="groupFilter.placeholder"
-        :icon="groupFilter.icon" :items="groupFilter.items"
-        :multiple="groupFilter.multiple" :loading="groupFilter.loading"
-        @update:open="groupFilter.onOpen" @update:model-value="groupFilter.onUpdated"
-      />
+      <UPopover
+        :mode="filterByBoth ? undefined : 'hover'"
+        :content="{
+          align: 'center',
+          side: 'bottom',
+        }"
+      >
+        <USelectMenu
+          :search-input="false"
+          :placeholder="roleFilter.placeholder"
+          :icon="roleFilter.icon" :items="roleFilter.items"
+          :multiple="roleFilter.multiple" :loading="filterOptionsStatus === 'pending'"
+          :disabled="isGroupFilterActive && !filterByBoth"
+          @update:model-value="roleFilter.onUpdated"
+        />
+        <template #content>
+          <UAlert
+            v-if="isGroupFilterActive && !filterByBoth"
+            :title="$t('users.alert.filter-by-both-role-group-disabled')"
+            color="warning" variant="soft" class="w-full" icon="i-lucide-triangle-alert"
+          />
+        </template>
+      </UPopover>
+      <UPopover
+        :mode="filterByBoth ? undefined : 'hover'"
+        :content="{
+          align: 'end',
+          side: 'bottom',
+        }"
+      >
+        <USelectMenu
+          ref="groupSelect"
+          v-model:search-term="groupFilter.searchTerm.value" ignore-filter
+          :placeholder="groupFilter.placeholder"
+          :icon="groupFilter.icon" :items="groupFilter.items"
+          :multiple="groupFilter.multiple" :loading="groupFilter.loading"
+          :disabled="isRoleFilterActive && !filterByBoth"
+          @update:open="groupFilter.onOpen" @update:model-value="groupFilter.onUpdated"
+        />
+        <template #content>
+          <UAlert
+            v-if="isRoleFilterActive && !filterByBoth"
+            :title="$t('users.alert.filter-by-both-role-group-disabled')"
+            color="warning" variant="soft" class="w-full" icon="i-lucide-triangle-alert"
+          />
+        </template>
+      </UPopover>
 
-      <UPopover>
+      <UPopover
+        :mode="filterByLastModified ? undefined : 'hover'"
+        :content="{
+          align: 'start',
+          side: 'bottom',
+        }"
+      >
         <UInput
+          id="last-modefied" name="last-modefied"
           icon="i-lucide-calendar"
           :placeholder="$t('users.table.column.last-modified')"
           :model-value="formattedDateRange"
+          :disabled="!filterByLastModified"
           :ui="{ base: `text-left ${dateRange.start ? '' : 'text-dimmed'}` }" readonly
         >
           <template #trailing>
@@ -330,11 +382,17 @@ const onRemove = async (event: FormSubmitEvent<typeof userOpState>) => {
         </UInput>
         <template #content>
           <UCalendar
+            v-if="filterByLastModified"
             v-model="dateRange" :number-of-months="2" class="p-2" range
             @update:valid-model-value="() => updateQuery(
               { s: dateRange.start?.toString(), e: dateRange.end?.toString(), p: 1 },
             )"
           />
+          <UAlert
+            v-else
+            :title="$t('users.alert.filter-by-last-modified-disabled')"
+            color="warning" variant="soft" class="w-full" icon="i-lucide-triangle-alert"
+          />
         </template>
       </UPopover>
     </template>
@@ -360,6 +418,7 @@ const onRemove = async (event: FormSubmitEvent<typeof userOpState>) => {
     <div class="flex-1 text-gray-500 text-sm">
       {{ pageInfo }}
     </div>
+
     <div class="flex-2 flex justify-center">
       <UPagination
         v-model:page="pageNumber"
@@ -368,6 +427,7 @@ const onRemove = async (event: FormSubmitEvent<typeof userOpState>) => {
         @update:page="(value) => updateQuery({ p: value })"
       />
     </div>
+
     <div class="flex-1" />
   </div>
 
diff --git a/src/app/types/forms.ts b/src/app/types/forms.ts
index bc7f7f31..8aa9acd2 100644
--- a/src/app/types/forms.ts
+++ b/src/app/types/forms.ts
@@ -5,6 +5,7 @@ type UseSelectMenuInfiniteScrollOptions<T> = {
   debounce?: number
   scrollDistance?: number
   query?: Record<string, string | number | boolean>
+  server?: boolean
 }
 
 type UseSelectMenuInfiniteScrollReturn = {
diff --git a/src/server/api/bulk.py b/src/server/api/bulk.py
index 2a1fa9b8..e7b4ad75 100644
--- a/src/server/api/bulk.py
+++ b/src/server/api/bulk.py
@@ -14,8 +14,15 @@
 from flask_pydantic import validate
 from redis.exceptions import ConnectionError as RedisConnectionError
 
-from server.api.helpers import validate_files
-from server.api.schemas import (
+from server.config import config
+from server.entities.bulk import ResultSummary, ValidateSummary
+from server.entities.login_user import LoginUser
+from server.exc import RecordNotFound
+from server.services import bulks, history_table
+from server.services.utils import require_enabled
+
+from .helpers import validate_files
+from .schemas import (
     BulkBody,
     BulkFileForm,
     ErrorResponse,
@@ -23,11 +30,6 @@
     TargetRepositoryForm,
     UploadQuery,
 )
-from server.config import config
-from server.entities.bulk import ResultSummary, ValidateSummary
-from server.entities.login_user import LoginUser
-from server.exc import RecordNotFound
-from server.services import bulks, history_table
 
 
 bp = Blueprint("bulk", __name__)
@@ -36,6 +38,7 @@
 @bp.post("/upload-file")
 @validate_files
 @validate(response_by_alias=True)
+@require_enabled("enable_bulk_operation")
 def upload_file(
     form: TargetRepositoryForm, files: BulkFileForm
 ) -> tuple[BulkBody | ErrorResponse, int]:
@@ -72,6 +75,7 @@ def upload_file(
 
 @bp.get("/validate/status/<string:task_id>")
 @validate(response_by_alias=True)
+@require_enabled("enable_bulk_operation")
 def validate_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
     """Get the status of a validation task.
 
@@ -95,6 +99,7 @@ def validate_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
 
 @bp.get("/validate/result/<string:task_id>")
 @validate(response_by_alias=True)
+@require_enabled("enable_bulk_operation")
 def validate_result(
     query: UploadQuery,
     task_id: str,
@@ -141,6 +146,7 @@ def validate_result(
 
 @bp.post("/execute")
 @validate(response_by_alias=True)
+@require_enabled("enable_bulk_operation")
 def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
     """Execute a bulk upload.
 
@@ -169,6 +175,7 @@ def execute(body: ExcuteRequest) -> tuple[BulkBody | ErrorResponse, int]:
 
 @bp.get("/execute/status/<string:task_id>")
 @validate()
+@require_enabled("enable_bulk_operation")
 def execute_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
     """Get the status of an execution task.
 
@@ -192,6 +199,7 @@ def execute_status(task_id: str) -> tuple[BulkBody | ErrorResponse, int]:
 
 @bp.get("/result/<string:history_id>")
 @validate(response_by_alias=True)
+@require_enabled("enable_bulk_operation")
 def result(
     history_id: UUID, query: UploadQuery
 ) -> tuple[ResultSummary | ErrorResponse, int]:
diff --git a/src/server/clients/groups.py b/src/server/clients/groups.py
index 3b2eac2b..6fca8573 100644
--- a/src/server/clients/groups.py
+++ b/src/server/clients/groups.py
@@ -91,10 +91,6 @@ def search(
         by_alias=True,
     )
 
-    from contrib import dump
-
-    dump(auth_params | attributes_params | query_params, "groups_search_query")
-
     response = requests.get(
         f"{config.MAP_CORE.base_url}{MAP_GROUPS_ENDPOINT}",
         params=auth_params | attributes_params | query_params,
@@ -104,8 +100,6 @@ def search(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "groups_search_response")
-
     if response.status_code > HTTPStatus.BAD_REQUEST:
         response.raise_for_status()
 
@@ -216,10 +210,6 @@ def post(
             alias_generator(name) for name in exclude
         ])
 
-    from contrib import dump
-
-    dump(auth_params | payload, "groups_post_payload")
-
     response = requests.post(
         f"{config.MAP_CORE.base_url}{MAP_GROUPS_ENDPOINT}",
         params=attributes_params,
@@ -230,8 +220,6 @@ def post(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "groups_post_response")
-
     if response.status_code > HTTPStatus.BAD_REQUEST:
         response.raise_for_status()
 
diff --git a/src/server/clients/services.py b/src/server/clients/services.py
index 0dc18ceb..a6c0e4f3 100644
--- a/src/server/clients/services.py
+++ b/src/server/clients/services.py
@@ -214,10 +214,6 @@ def post(
             alias_generator(name) for name in exclude
         ])
 
-    from contrib import dump
-
-    dump({"request": auth_params} | payload, "service_post_payload")
-
     response = requests.post(
         f"{config.MAP_CORE.base_url}{MAP_SERVICES_ENDPOINT}",
         params=attributes_params,
@@ -228,8 +224,6 @@ def post(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "service_post_response")
-
     status_code = response.status_code
     if status_code not in {HTTPStatus.BAD_REQUEST, HTTPStatus.CONFLICT}:
         response.raise_for_status()
diff --git a/src/server/clients/users.py b/src/server/clients/users.py
index 4a4e419f..6f734811 100644
--- a/src/server/clients/users.py
+++ b/src/server/clients/users.py
@@ -91,10 +91,6 @@ def search(
         by_alias=True,
     )
 
-    from contrib import dump
-
-    dump(auth_params | attributes_params | query_params, "users_search_query")
-
     response = requests.get(
         f"{config.MAP_CORE.base_url}{MAP_USERS_ENDPOINT}",
         params=auth_params | attributes_params | query_params,
@@ -104,8 +100,6 @@ def search(
         timeout=config.MAP_CORE.timeout,
     )
 
-    dump(response.text, "users_search_response")
-
     if response.status_code > HTTPStatus.BAD_REQUEST:
         response.raise_for_status()
 
diff --git a/src/server/config.py b/src/server/config.py
index efcd5351..aa968ba7 100644
--- a/src/server/config.py
+++ b/src/server/config.py
@@ -97,6 +97,12 @@ class RuntimeConfig(BaseSettings):
 
     DEVELOP: DevelopConfig | None = None
 
+    FEATURES: FeaturesConfig
+    """Feature flags for enabling/disabling application features.
+
+        These are due to temporary constraints
+        in the future, all features will be enabled and the settings will be deleted."""
+
     @computed_field
     @property
     def SQLALCHEMY_DATABASE_URI(self) -> URL:
@@ -575,6 +581,18 @@ class DevAccountConfig(BaseModel):
     """User name of the development account."""
 
 
+class FeaturesConfig(BaseModel):
+    """Schema for feature flags configuration."""
+
+    search_only_username: bool = True
+    """Whether user search by user name only in users.
+    If false, Enable search by username, email, or ePPN.
+    """
+
+    enable_bulk_operation: bool = False
+    """Whether mAP Core API bulk operation is enabled or disabled."""
+
+
 def safe_eval(expr: str) -> int | str:
     """Safely evaluate a restricted arithmetic expression.
 
diff --git a/src/server/services/groups.py b/src/server/services/groups.py
index 8365cc07..e1c49b0c 100644
--- a/src/server/services/groups.py
+++ b/src/server/services/groups.py
@@ -472,6 +472,8 @@ def delete_multiple(group_ids: set[str]) -> set[str] | None:
         CredentialsError: If the client credentials are invalid.
         UnexpectedResponseError: If response from mAP Core API is unexpected.
     """
+    if config.FEATURES.enable_bulk_operation:
+        return delete_multiple_sequentially(group_ids)
     operations = [
         BulkOperation(method="DELETE", path=f"/Groups/{group_id}")
         for group_id in group_ids
@@ -525,6 +527,35 @@ def delete_multiple(group_ids: set[str]) -> set[str] | None:
     return failed_list if failed_list != set() else None
 
 
+def delete_multiple_sequentially(group_ids: set[str]) -> set[str] | None:
+    """Delete groups from mAP Core API by group_ids asynchronously.
+
+    Args:
+        group_ids (list[str]): ID of the Group resource.
+
+    Returns:
+        list[str]: group id list of failed.
+
+    Raises:
+        OAuthTokenError: If the access token is invalid or expired.
+        CredentialsError: If the client credentials are invalid.
+    """
+    failed_list: set[str] = set()
+    for group_id in group_ids:
+        try:
+            delete_by_id(group_id)
+        except OAuthTokenError, CredentialsError:
+            raise
+        except (
+            ResourceNotFound,
+            ResourceInvalid,
+            UnexpectedResponseError,
+        ):
+            failed_list.add(group_id)
+
+    return failed_list if failed_list != set() else None
+
+
 def delete_by_id(group_id: str) -> None:
     """Delete group from mAP Core API by group_id.
 
diff --git a/src/server/services/utils/__init__.py b/src/server/services/utils/__init__.py
index 686dd1b8..b514cf31 100644
--- a/src/server/services/utils/__init__.py
+++ b/src/server/services/utils/__init__.py
@@ -5,7 +5,7 @@
 """Provides utilities for service."""
 
 from .affiliations import detect_affiliation, detect_affiliations, detect_repository
-from .decoraters import session_required
+from .decoraters import require_enabled, session_required
 from .filter_options import (
     search_groups_options,
     search_history_filter_options,
diff --git a/src/server/services/utils/decoraters.py b/src/server/services/utils/decoraters.py
index ef52fea6..e877dddc 100644
--- a/src/server/services/utils/decoraters.py
+++ b/src/server/services/utils/decoraters.py
@@ -8,6 +8,10 @@
 
 from functools import wraps
 
+from flask import abort
+
+from server.config import config
+
 
 def session_required[**P, R](func: t.Callable[P, R]) -> t.Callable[..., R]:
     """Decorator to ensure that a valid session exists.
@@ -24,3 +28,18 @@ def wrapper(*args: P.args, session_id: str | None = None, **kwargs: P.kwargs) ->
         return func(*args, **kwargs)
 
     return wrapper
+
+
+def require_enabled[**P, R](setting: t.Literal["enable_bulk_operation"]):  # noqa: ANN201, D103
+
+    def decorator(func):  # noqa: ANN001, ANN202
+
+        @wraps(func)
+        def wrapper(*args, **kwargs):  # noqa: ANN002, ANN003, ANN202
+            if not getattr(config.FEATURES, setting, False):
+                abort(404)
+            return func(*args, **kwargs)
+
+        return wrapper
+
+    return decorator
diff --git a/src/server/services/utils/search_queries.py b/src/server/services/utils/search_queries.py
index e502dd65..850a9eaf 100644
--- a/src/server/services/utils/search_queries.py
+++ b/src/server/services/utils/search_queries.py
@@ -271,13 +271,13 @@ def build_users_search_query(criteria: UsersCriteria) -> SearchRequestParameter:
 
     if criteria.q:
         # partial match search on user_name, emails, edu_person_principal_names
-        filter_expr.append(
-            " or ".join([
-                f'({path("user_name")} co "{criteria.q}")',
+        term_filter = [f'({path("user_name")} co "{criteria.q}")']
+        if not config.FEATURES.search_only_username:
+            term_filter.extend([
                 f'({path("emails.value")} co "{criteria.q}")',
                 f'({path("edu_person_principal_names.value")} co "{criteria.q}")',
             ])
-        )
+        filter_expr.append(" or ".join(term_filter))
 
     if criteria.i:
         # exact match search on IDs