diff --git a/backend/src/database/repositories/organizationRepository.ts b/backend/src/database/repositories/organizationRepository.ts
index 3295fa937d..546e898cec 100644
--- a/backend/src/database/repositories/organizationRepository.ts
+++ b/backend/src/database/repositories/organizationRepository.ts
@@ -479,7 +479,7 @@ class OrganizationRepository {
                             segment_level as (select case
                                         when "parentSlug" is not null and "grandparentSlug" is not null
                                             then 'child'
-                                        when "parentSlug" is null and "grandparentSlug" is not null
+                                        when "parentSlug" is not null and "grandparentSlug" is null
                                             then 'parent'
                                         when "parentSlug" is null and "grandparentSlug" is null
                                             then 'grandparent'
@@ -495,7 +495,7 @@ class OrganizationRepository {
                             segment_level sl
                             on
                             (sl.level = 'child' and s.id = sl.id) or
-                            (sl.level = 'parent' and s."parentSlug" = sl.slug) or
+                            (sl.level = 'parent' and s."parentSlug" = sl.slug and s."grandparentSlug" is not null) or
                             (sl.level = 'grandparent' and s."grandparentSlug" = sl.slug)`
     }
 
diff --git a/frontend/public/images/integrations/slack-bot.png b/frontend/public/images/integrations/slack-bot.png
new file mode 100644
index 0000000000..0f67d701b5
Binary files /dev/null and b/frontend/public/images/integrations/slack-bot.png differ
diff --git a/frontend/src/integrations/github/components/github-connect.vue b/frontend/src/integrations/github/components/github-connect.vue
index e5110ad4ba..6ad0651559 100644
--- a/frontend/src/integrations/github/components/github-connect.vue
+++ b/frontend/src/integrations/github/components/github-connect.vue
@@ -3,8 +3,10 @@
 </template>
 
 <script setup>
-import { defineProps, computed } from 'vue';
+import { computed } from 'vue';
 import config from '@/config';
+import ConfirmDialog from '@/shared/dialog/confirm-dialog';
+import { useRouter } from 'vue-router';
 
 defineProps({
   integration: {
@@ -13,11 +15,38 @@ defineProps({
   },
 });
 
+const router = useRouter();
+
 // We have 3 GitHub apps: test, test-local and prod
 // Getting the proper URL from config file
 const githubConnectUrl = computed(() => config.gitHubInstallationUrl);
 const connect = () => {
-  window.open(githubConnectUrl.value, '_self');
+  ConfirmDialog({
+    type: 'notification',
+    title:
+      'Are you the admin of your GitHub organization?',
+    titleClass: 'text-lg pt-2',
+    message:
+      `Only GitHub users with admin permissions are able to connect crowd.dev's GitHub integration.
+      If you are an organization member, you will need an approval from the GitHub workspace admin. <a href="https://docs.crowd.dev/docs/github-integration" target="_blank">Read more</a>`,
+    icon: 'ri-information-line',
+    confirmButtonText: 'I\'m the GitHub organization admin',
+    cancelButtonText: 'Invite organization admin to this workspace',
+    verticalCancelButtonClass: 'btn btn--md btn--primary w-full',
+    verticalConfirmButtonClass: 'btn btn--md btn--secondary w-full !mb-2',
+    vertical: true,
+    distinguishCancelAndClose: true,
+    autofocus: false,
+    messageClass: 'text-xs !leading-5 !mt-1 text-gray-600',
+  }).then(() => {
+    window.open(githubConnectUrl.value, '_self');
+  }).catch((action) => {
+    if (action === 'cancel') {
+      router.push({
+        name: 'settings',
+      });
+    }
+  });
 };
 
 </script>
diff --git a/frontend/src/integrations/slack/components/slack-connect.vue b/frontend/src/integrations/slack/components/slack-connect.vue
index a2c9f2614b..94e53afa7f 100644
--- a/frontend/src/integrations/slack/components/slack-connect.vue
+++ b/frontend/src/integrations/slack/components/slack-connect.vue
@@ -20,7 +20,7 @@ defineProps({
 });
 
 const connectUrl = computed(() => {
-  const redirectUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}?success=true`;
+  const redirectUrl = `${window.location.protocol}//${window.location.host}${window.location.pathname}?slack-success=true`;
 
   return `${config.backendUrl}/slack/${
     store.getters['auth/currentTenant'].id
diff --git a/frontend/src/modules/integration/components/integration-list-item.vue b/frontend/src/modules/integration/components/integration-list-item.vue
index 628fe0f316..0f9f06f3e8 100644
--- a/frontend/src/modules/integration/components/integration-list-item.vue
+++ b/frontend/src/modules/integration/components/integration-list-item.vue
@@ -2,46 +2,60 @@
   <div class="s panel" :class="computedClass">
     <div class="flex items-center justify-between">
       <img :alt="integration.name" :src="integration.image" class="h-6 mb-4" />
-      <span v-if="isDone" class="badge badge--green">Connected</span>
-      <div v-else-if="isError" class="text-red-500 flex items-center text-sm">
-        <i class="ri-error-warning-line mr-1" /> Failed to connect
-      </div>
-      <div v-else-if="isNoData" class="text-red-500 flex items-center text-sm">
-        <i class="ri-error-warning-line mr-1" /> Not receiving activities
-      </div>
-      <div
-        v-else-if="isWaitingForAction"
-        class="text-yellow-600 flex items-center text-sm"
-      >
-        <i class="ri-alert-line mr-1" /> Action required
-      </div>
-      <div
-        v-else-if="isWaitingApproval"
-        class="text-gray-500 flex items-center text-sm"
-      >
-        <i class="ri-time-line mr-1" /> Waiting for approval
-      </div>
-      <div
-        v-else-if="isNeedsToBeReconnected"
-        class="text-yellow-600 flex items-center text-sm"
-      >
-        <i class="ri-alert-line mr-1" /> Needs to be reconnected
-      </div>
-      <div v-else-if="isConnected" class="flex items-center">
-        <div
-          v-loading="true"
-          class="app-page-spinner !relative h-4 !w-4 mr-2 !min-h-fit"
-        />
-
-        <span class="text-xs text-gray-900 mr-2">In progress</span>
-        <el-tooltip
-          content="Fetching first activities from an integration might take a few minutes"
-          placement="top"
-        >
-          <i class="ri-question-line text-gray-400" />
-        </el-tooltip>
+      <div>
+        <div class="mb-1 flex justify-end">
+          <span v-if="isDone" class="badge badge--green">Connected</span>
+          <div v-else-if="isError" class="text-red-500 flex items-center text-sm">
+            <i class="ri-error-warning-line mr-1" /> Failed to connect
+          </div>
+          <div v-else-if="isNoData" class="text-red-500 flex items-center text-sm">
+            <i class="ri-error-warning-line mr-1" /> Not receiving activities
+          </div>
+          <div
+            v-else-if="isWaitingForAction"
+            class="text-yellow-600 flex items-center text-sm"
+          >
+            <i class="ri-alert-line mr-1" /> Action required
+          </div>
+          <div
+            v-else-if="isWaitingApproval"
+            class="text-gray-500 flex items-center text-sm"
+          >
+            <i class="ri-time-line mr-1" /> Waiting for approval
+          </div>
+          <div
+            v-else-if="isNeedsToBeReconnected"
+            class="text-yellow-600 flex items-center text-sm"
+          >
+            <i class="ri-alert-line mr-1" /> Needs to be reconnected
+          </div>
+          <div v-else-if="isConnected" class="flex items-center">
+            <div
+              v-loading="true"
+              class="app-page-spinner !relative h-4 !w-4 mr-2 !min-h-fit"
+            />
+
+            <span class="text-xs text-gray-900 mr-2">In progress</span>
+            <el-tooltip
+              content="Fetching first activities from an integration might take a few minutes"
+              placement="top"
+            >
+              <i class="ri-question-line text-gray-400" />
+            </el-tooltip>
+          </div>
+        </div>
+        <div class="h-5 leading-5 text-end">
+          <el-tooltip
+            v-if="isDone"
+            :content="lastSynced.absolute"
+            placement="top"
+          >
+            <span class="text-3xs italic text-gray-500">{{ lastSynced.relative }}</span>
+          </el-tooltip>
+        </div>
       </div>
     </div>
+
     <div>
       <div class="flex mb-2">
         <span class="block font-semibold">{{ integration.name }}</span>
@@ -101,11 +115,12 @@
 
 <script setup>
 import { useStore } from 'vuex';
-import { defineProps, computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { FeatureFlag } from '@/featureFlag';
 import AppIntegrationConnect from '@/modules/integration/components/integration-connect.vue';
 import { isCurrentDateAfterGivenWorkingDays } from '@/utils/date';
 import { ERROR_BANNER_WORKING_DAYS_DISPLAY } from '@/modules/integration/integration-store';
+import moment from 'moment';
 
 const store = useStore();
 const props = defineProps({
@@ -115,6 +130,21 @@ const props = defineProps({
   },
 });
 
+onMounted(() => {
+  moment.updateLocale('en', {
+    relativeTime: {
+      s: '1s',
+      ss: '%ds',
+      m: '1min',
+      mm: '%dmin',
+      h: '1h',
+      hh: '%dh',
+      d: '1d',
+      dd: '%dd',
+    },
+  });
+});
+
 const computedClass = computed(() => ({
   'integration-custom': props.integration.platform === 'custom',
 }));
@@ -146,6 +176,11 @@ const isNeedsToBeReconnected = computed(
   () => props.integration.status === 'needs-reconnect',
 );
 
+const lastSynced = computed(() => ({
+  absolute: moment(props.integration.updatedAt).format('MMM DD, YYYY HH:mm'),
+  relative: `last synced ${moment(props.integration.updatedAt).fromNow()}`,
+}));
+
 const loadingDisconnect = ref(false);
 
 const handleDisconnect = async () => {
diff --git a/frontend/src/modules/integration/components/integration-list-page.vue b/frontend/src/modules/integration/components/integration-list-page.vue
index 3a2e3dad09..cde9fab898 100644
--- a/frontend/src/modules/integration/components/integration-list-page.vue
+++ b/frontend/src/modules/integration/components/integration-list-page.vue
@@ -35,22 +35,6 @@
             >Read more</a>
           </template>
         </app-alert>
-        <app-alert
-          v-if="
-            integrations.slack
-              && integrations.slack.status === 'in-progress'
-          "
-        >
-          <template #body>
-            Add Slack Bot to channels.
-            <a
-              href="https://docs.crowd.dev/docs/slack-integration#how-to-install"
-              class="font-semibold absolute right-0 inset-y-0 flex items-center pr-4 hover:underline"
-              rel="noopener noreferrer"
-              target="_blank"
-            >Read more</a>
-          </template>
-        </app-alert>
         <app-alert
           v-if="
             integrations.discord
@@ -118,6 +102,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import AppLfIntegrationsPageHeader from '@/modules/lf/layout/components/lf-integrations-page-header.vue';
+import ConfirmDialog from '@/shared/dialog/confirm-dialog';
 import AppIntegrationList from './integration-list.vue';
 
 export default {
@@ -132,5 +117,45 @@ export default {
       integrationsWithNoData: 'integration/withNoData',
     }),
   },
+
+  watch: {
+    '$route.query.slack-success': {
+      immediate: true,
+      handler(value) {
+        if (value) {
+          ConfirmDialog({
+            vertical: true,
+            type: 'custom',
+            icon: '<img src="https://cdn-icons-png.flaticon.com/512/3800/3800024.png" class="h-8 w-8" alt="slack logo" />',
+            title: `<span class="flex items-start gap-1">Connect Slack bot 
+              <span class="text-brand-500 text-3xs leading-3 pt-1 font-normal">Required</span></span>`,
+            titleClass: 'text-lg',
+            message: `
+            <img src="/images/integrations/slack-bot.png" class="mb-6" alt="slack bot installation" />
+            To fetch data from Slack, you need to install the crowd.dev Slack bot and add it to all channels you want to track. <br><br>
+            You can either add the Slack bot directly from a channel, or add the app via channel Integrations.`,
+            confirmButtonText: 'How to connect Slack bot',
+            showCancelButton: false,
+            messageClass: 'text-xs !leading-5 !mt-1 text-gray-600',
+            verticalCustomClass: 'custom-slack-message-box',
+            closeOnClickModal: false,
+            hideCloseButton: true,
+          }).then(() => {
+            window.open('https://docs.crowd.dev/docs/slack-integration#how-to-install', '_blank');
+            this.$router.replace({ query: null });
+          });
+        }
+      },
+    },
+  },
 };
 </script>
+
+<style>
+.custom-slack-message-box .el-button--primary span::after {
+  content: "\ecaf";
+  font-family: "remixicon" !important;
+  font-size: 18px;
+  margin-left: 0.5rem;
+}
+</style>
diff --git a/frontend/src/modules/member/config/filters/jobTitle/config.ts b/frontend/src/modules/member/config/filters/jobTitle/config.ts
new file mode 100644
index 0000000000..b3f825733e
--- /dev/null
+++ b/frontend/src/modules/member/config/filters/jobTitle/config.ts
@@ -0,0 +1,24 @@
+import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
+import {
+  StringFilterConfig,
+  StringFilterOptions,
+  StringFilterValue,
+} from '@/shared/modules/filters/types/filterTypes/StringFilterConfig';
+import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
+import { apiFilterRendererByType } from '@/shared/modules/filters/config/apiFilterRendererByType';
+
+const jobTitle: StringFilterConfig = {
+  id: 'jobTitle',
+  label: 'Job title',
+  iconClass: 'ri-suitcase-line',
+  type: FilterConfigType.STRING,
+  options: {},
+  itemLabelRenderer(value: StringFilterValue, options: StringFilterOptions): string {
+    return itemLabelRendererByType[FilterConfigType.STRING]('Job title', value, options);
+  },
+  apiFilterRenderer(value: StringFilterValue): any[] {
+    return apiFilterRendererByType[FilterConfigType.STRING]('attributes.jobTitle.default', value);
+  },
+};
+
+export default jobTitle;
diff --git a/frontend/src/modules/member/config/filters/main.ts b/frontend/src/modules/member/config/filters/main.ts
index ed005eb375..b974aa333c 100644
--- a/frontend/src/modules/member/config/filters/main.ts
+++ b/frontend/src/modules/member/config/filters/main.ts
@@ -13,10 +13,14 @@ import lastActivityDate from './lastActivityDate/config';
 import reach from './reach/config';
 import projects from './projects/config';
 import tags from './tags/config';
+import memberName from './memberName/config';
+import jobTitle from './jobTitle/config';
 
 export const memberFilters: Record<string, FilterConfig> = {
+  memberName,
   noOfActivities,
   noOfOSSContributions,
+  jobTitle,
   activeOn,
   activityType,
   avgSentiment,
diff --git a/frontend/src/modules/member/config/filters/memberName/config.ts b/frontend/src/modules/member/config/filters/memberName/config.ts
new file mode 100644
index 0000000000..5412486432
--- /dev/null
+++ b/frontend/src/modules/member/config/filters/memberName/config.ts
@@ -0,0 +1,31 @@
+import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
+import {
+  StringFilterConfig,
+  StringFilterOptions,
+  StringFilterValue,
+} from '@/shared/modules/filters/types/filterTypes/StringFilterConfig';
+import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
+import { apiFilterRendererByType } from '@/shared/modules/filters/config/apiFilterRendererByType';
+
+const memberName: StringFilterConfig = {
+  id: 'memberName',
+  label: 'Member name',
+  iconClass: 'ri-account-circle-line',
+  type: FilterConfigType.STRING,
+  options: {},
+  itemLabelRenderer(
+    value: StringFilterValue,
+    options: StringFilterOptions,
+  ): string {
+    return itemLabelRendererByType[FilterConfigType.STRING](
+      'Member name',
+      value,
+      options,
+    );
+  },
+  apiFilterRenderer(value: StringFilterValue): any[] {
+    return apiFilterRendererByType[FilterConfigType.STRING]('displayName', value);
+  },
+};
+
+export default memberName;
diff --git a/frontend/src/modules/organization/config/filters/headcount/config.ts b/frontend/src/modules/organization/config/filters/headcount/config.ts
index 5e951fd13a..9a4333de53 100644
--- a/frontend/src/modules/organization/config/filters/headcount/config.ts
+++ b/frontend/src/modules/organization/config/filters/headcount/config.ts
@@ -1,25 +1,25 @@
 import { FilterConfigType } from '@/shared/modules/filters/types/FilterConfig';
 import {
-  SelectFilterConfig, SelectFilterOptions,
-  SelectFilterValue,
-} from '@/shared/modules/filters/types/filterTypes/SelectFilterConfig';
+  MultiSelectFilterConfig, MultiSelectFilterOptions,
+  MultiSelectFilterValue,
+} from '@/shared/modules/filters/types/filterTypes/MultiSelectFilterConfig';
 import { itemLabelRendererByType } from '@/shared/modules/filters/config/itemLabelRendererByType';
 import options from './options';
 
-const headcount: SelectFilterConfig = {
+const headcount: MultiSelectFilterConfig = {
   id: 'headcount',
   label: 'Headcount',
   iconClass: 'ri-group-2-line',
-  type: FilterConfigType.SELECT,
+  type: FilterConfigType.MULTISELECT,
   options: {
     options,
   },
-  itemLabelRenderer(value: SelectFilterValue, options: SelectFilterOptions): string {
-    return itemLabelRendererByType[FilterConfigType.SELECT]('Headcount', value, options);
+  itemLabelRenderer(value: MultiSelectFilterValue, options: MultiSelectFilterOptions): string {
+    return itemLabelRendererByType[FilterConfigType.MULTISELECT]('Headcount', value, options);
   },
-  apiFilterRenderer({ value, include }: SelectFilterValue): any[] {
+  apiFilterRenderer({ value, include }: MultiSelectFilterValue): any[] {
     const filter = {
-      size: { eq: value },
+      or: value.map((count) => ({ size: { eq: count } })),
     };
     return [
       (include ? filter : { not: filter }),
diff --git a/frontend/src/modules/organization/config/filters/headcount/options.ts b/frontend/src/modules/organization/config/filters/headcount/options.ts
index 0d8012f190..b5b4853e9c 100644
--- a/frontend/src/modules/organization/config/filters/headcount/options.ts
+++ b/frontend/src/modules/organization/config/filters/headcount/options.ts
@@ -23,6 +23,18 @@ const options: MultiSelectFilterOptionGroup[] = [
         label: '501-1000',
         value: '501-1000',
       },
+      {
+        label: '1001-5000',
+        value: '1001-5001',
+      },
+      {
+        label: '5001-10000',
+        value: '5001-10000',
+      },
+      {
+        label: '> 10000',
+        value: '10000+',
+      },
     ],
   },
 ];
diff --git a/frontend/src/shared/dialog/confirm-dialog.js b/frontend/src/shared/dialog/confirm-dialog.js
index 554683aaf3..10521aa706 100644
--- a/frontend/src/shared/dialog/confirm-dialog.js
+++ b/frontend/src/shared/dialog/confirm-dialog.js
@@ -17,6 +17,15 @@ export default ({
   confirmButtonText = 'Discard',
   confirmButtonClass = 'btn btn--md btn--primary',
   icon = 'ri-error-warning-line',
+  distinguishCancelAndClose = false,
+  autofocus = true,
+  closeOnClickModal = true,
+  titleClass,
+  messageClass,
+  verticalCancelButtonClass,
+  verticalConfirmButtonClass,
+  verticalCustomClass,
+  hideCloseButton = false,
 }) => {
   let iconColorClass = 'text-yellow-600';
   let iconBgColorClass = 'bg-yellow-100';
@@ -41,25 +50,32 @@ export default ({
       class: 'flex',
     }, // props
     [
-      h(
-        'span', // type
+      type === 'custom' ? h(
+        'span',
         {
-          class: `rounded-full ${iconBgColorClass} w-10 h-10 flex items-center justify-center absolute custom-icon`,
-        }, // props
-        [
-          h(
-            'i', // type
-            {
-              class: `${icon} text-lg ${iconColorClass} leading-none`,
-            }, // props
-            [],
-          ),
-        ],
-      ),
+          innerHTML: icon,
+          class: '',
+        },
+      )
+        : h(
+          'span', // type
+          {
+            class: `rounded-full ${iconBgColorClass} w-10 h-10 flex items-center justify-center absolute custom-icon`,
+          }, // props
+          [
+            h(
+              'i', // type
+              {
+                class: `${icon} text-lg ${iconColorClass} leading-none`,
+              }, // props
+              [],
+            ),
+          ],
+        ),
       h('div', [
         h('p', {
           innerHTML: message,
-          class: 'text-gray-500 text-sm',
+          class: `text-gray-500 text-sm ${messageClass}`,
         }),
         highlightedInfo
           ? h(
@@ -90,22 +106,29 @@ export default ({
             class: 'flex justify-between items-center mb-4',
           },
           [
-            h(
-              'span', // type
+            type === 'custom' ? h(
+              'span',
               {
-                class: `rounded-full ${iconBgColorClass} w-10 h-10 flex items-center justify-center custom-icon`,
-              }, // props
-              [
-                h(
-                  'i', // type
-                  {
-                    class: `${icon} text-lg ${iconColorClass} leading-none`,
-                  }, // props
-                  [],
-                ),
-              ],
-            ),
-            h(
+                innerHTML: icon,
+                class: '',
+              },
+            )
+              : h(
+                'span', // type
+                {
+                  class: `rounded-full ${iconBgColorClass} w-10 h-10 flex items-center justify-center custom-icon`,
+                }, // props
+                [
+                  h(
+                    'i', // type
+                    {
+                      class: `${icon} text-lg ${iconColorClass} leading-none`,
+                    }, // props
+                    [],
+                  ),
+                ],
+              ),
+            !hideCloseButton ? h(
               'button',
               {
                 class:
@@ -128,12 +151,12 @@ export default ({
                   [],
                 ),
               ],
-            ),
+            ) : null,
           ],
         ),
         h('h6', {
           innerHTML: title,
-          class: 'text-black mb-3',
+          class: `text-black mb-3 ${titleClass}`,
         }),
         badgeContent
           ? h('div', {
@@ -144,7 +167,7 @@ export default ({
           : undefined,
         h('p', {
           innerHTML: message,
-          class: 'text-gray-500 text-sm',
+          class: `text-gray-500 text-sm ${messageClass}`,
         }),
         highlightedInfo
           ? h(
@@ -170,7 +193,7 @@ export default ({
       ],
     );
 
-    const overrideCustomClass = 'confirm-dialog confirm-dialog--vertical';
+    const overrideCustomClass = `confirm-dialog confirm-dialog--vertical ${verticalCustomClass}`;
     const overrideConfirmButtonClass = 'btn btn--md btn--primary w-full';
     const overrideCancelButtonClass = 'btn btn-link btn-link--md btn-link--primary w-full';
 
@@ -181,9 +204,12 @@ export default ({
       showCancelButton,
       customClass: overrideCustomClass,
       confirmButtonText,
-      confirmButtonClass: overrideConfirmButtonClass,
+      confirmButtonClass: verticalConfirmButtonClass || overrideConfirmButtonClass,
       cancelButtonText,
-      cancelButtonClass: overrideCancelButtonClass,
+      cancelButtonClass: verticalCancelButtonClass || overrideCancelButtonClass,
+      distinguishCancelAndClose,
+      autofocus,
+      closeOnClickModal,
     });
   }
 
@@ -197,5 +223,8 @@ export default ({
     cancelButtonClass,
     confirmButtonText,
     confirmButtonClass,
+    distinguishCancelAndClose,
+    autofocus,
+    closeOnClickModal,
   });
 };
diff --git a/frontend/src/shared/modules/filters/components/filterTypes/StringFilter.vue b/frontend/src/shared/modules/filters/components/filterTypes/StringFilter.vue
index b973b8cb53..ce6eb3585d 100644
--- a/frontend/src/shared/modules/filters/components/filterTypes/StringFilter.vue
+++ b/frontend/src/shared/modules/filters/components/filterTypes/StringFilter.vue
@@ -44,6 +44,7 @@ const form = computed<StringFilterValue>({
 
 const defaultForm: StringFilterValue = {
   value: '',
+  include: true,
   operator: FilterStringOperator.LIKE,
 };
 
diff --git a/frontend/src/shared/modules/filters/components/partials/FilterIncludeSwitch.vue b/frontend/src/shared/modules/filters/components/partials/FilterIncludeSwitch.vue
index a5d9804aad..e958a620e5 100644
--- a/frontend/src/shared/modules/filters/components/partials/FilterIncludeSwitch.vue
+++ b/frontend/src/shared/modules/filters/components/partials/FilterIncludeSwitch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex justify-start border-b border-gray-100 p-4">
+  <div class="flex justify-start items-center border-b border-gray-100 p-4">
     <el-switch
       v-model="model"
       :active-text="modelValue ? 'Include' : 'Exclude'"
@@ -7,6 +7,13 @@
       size="small"
       data-qa="filter-include-switch"
     />
+
+    <el-tooltip
+      content="If excluded, turns the filter into a negative condition"
+      placement="top"
+    >
+      <i class="ri-question-line text-gray-400 text-base" />
+    </el-tooltip>
   </div>
 </template>
 
@@ -36,7 +43,10 @@ export default {
 
 <style lang="scss">
 .filter-include-switch{
+   @apply grow-0;
+
  .el-switch__label{
+   @apply mr-2;
    font-weight: normal !important;
  }
 }
diff --git a/frontend/src/shared/modules/filters/services/custom-attributes.service.ts b/frontend/src/shared/modules/filters/services/custom-attributes.service.ts
index ee4e1deba5..4cf753ba66 100644
--- a/frontend/src/shared/modules/filters/services/custom-attributes.service.ts
+++ b/frontend/src/shared/modules/filters/services/custom-attributes.service.ts
@@ -32,7 +32,7 @@ export const customAttributesService = () => {
   ): Record<string, FilterConfig> {
     const filters: Record<string, FilterConfig> = {};
     attributes
-      .filter((attribute) => attribute.show)
+      .filter((attribute) => attribute.show && attribute.name !== 'jobTitle')
       .forEach((attribute) => {
         // Number type
         if (attribute.type === FilterCustomAttributeType.NUMBER) {
diff --git a/frontend/src/shared/modules/filters/types/filterTypes/StringFilterConfig.ts b/frontend/src/shared/modules/filters/types/filterTypes/StringFilterConfig.ts
index 41310900cd..da5bb991ee 100644
--- a/frontend/src/shared/modules/filters/types/filterTypes/StringFilterConfig.ts
+++ b/frontend/src/shared/modules/filters/types/filterTypes/StringFilterConfig.ts
@@ -7,6 +7,7 @@ export interface StringFilterOptions {}
 export interface StringFilterValue {
   operator: FilterStringOperator,
   value: string,
+  include: boolean
 }
 
 export interface StringFilterConfig extends BaseFilterConfig {
diff --git a/services/apps/data_sink_worker/config/custom-environment-variables.json b/services/apps/data_sink_worker/config/custom-environment-variables.json
index 6e4f55d28b..6f13b81482 100644
--- a/services/apps/data_sink_worker/config/custom-environment-variables.json
+++ b/services/apps/data_sink_worker/config/custom-environment-variables.json
@@ -20,5 +20,11 @@
   },
   "slackAlerting": {
     "url": "CROWD_SLACK_ALERTING_URL"
+  },
+  "redis": {
+    "username": "CROWD_REDIS_USERNAME",
+    "password": "CROWD_REDIS_PASSWORD",
+    "host": "CROWD_REDIS_HOST",
+    "port": "CROWD_REDIS_PORT"
   }
 }
diff --git a/services/apps/data_sink_worker/config/default.json b/services/apps/data_sink_worker/config/default.json
index 85c567c175..8f82d4db45 100644
--- a/services/apps/data_sink_worker/config/default.json
+++ b/services/apps/data_sink_worker/config/default.json
@@ -1,4 +1,5 @@
 {
   "db": {},
-  "sqs": {}
+  "sqs": {},
+  "redis": {}
 }
diff --git a/services/apps/data_sink_worker/package-lock.json b/services/apps/data_sink_worker/package-lock.json
index 7137d71374..6ef21428dd 100644
--- a/services/apps/data_sink_worker/package-lock.json
+++ b/services/apps/data_sink_worker/package-lock.json
@@ -14,6 +14,7 @@
         "@crowd/database": "file:../../libs/database",
         "@crowd/integrations": "file:../../libs/integrations",
         "@crowd/logging": "file:../../libs/logging",
+        "@crowd/redis": "file:../../libs/redis",
         "@crowd/sentiment": "file:../../libs/sentiment",
         "@crowd/sqs": "file:../../libs/sqs",
         "@crowd/types": "file:../../libs/types",
@@ -39,6 +40,7 @@
       }
     },
     "../../libs/alerting": {
+      "name": "@crowd/alerting",
       "version": "1.0.0",
       "dependencies": {
         "@types/node": "^20.3.1",
@@ -53,10 +55,12 @@
       }
     },
     "../../libs/common": {
+      "name": "@crowd/common",
       "version": "1.0.0",
       "dependencies": {
         "@crowd/logging": "file:../logging",
         "@crowd/types": "file:../types",
+        "psl": "^1.9.0",
         "uuid": "^9.0.0"
       },
       "devDependencies": {
@@ -71,6 +75,7 @@
       }
     },
     "../../libs/conversations": {
+      "name": "@crowd/conversations",
       "version": "1.0.0",
       "dependencies": {
         "@crowd/common": "file:../common",
@@ -92,6 +97,7 @@
       }
     },
     "../../libs/database": {
+      "name": "@crowd/database",
       "version": "1.0.0",
       "dependencies": {
         "@crowd/common": "file:../common",
@@ -110,6 +116,7 @@
       }
     },
     "../../libs/integrations": {
+      "name": "@crowd/integrations",
       "version": "1.0.0",
       "dependencies": {
         "@crowd/common": "file:../common",
@@ -136,6 +143,7 @@
       }
     },
     "../../libs/logging": {
+      "name": "@crowd/logging",
       "version": "1.0.0",
       "dependencies": {
         "@crowd/common": "file:../common",
@@ -155,7 +163,27 @@
         "typescript": "^5.0.4"
       }
     },
+    "../../libs/redis": {
+      "version": "1.0.0",
+      "dependencies": {
+        "@crowd/common": "file:../common",
+        "@crowd/logging": "file:../logging",
+        "@crowd/types": "file:../types",
+        "redis": "^4.6.6"
+      },
+      "devDependencies": {
+        "@types/node": "^18.16.3",
+        "@typescript-eslint/eslint-plugin": "^5.59.2",
+        "@typescript-eslint/parser": "^5.59.2",
+        "eslint": "^8.39.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "prettier": "^2.8.8",
+        "typescript": "^5.0.4"
+      }
+    },
     "../../libs/sentiment": {
+      "name": "@crowd/sentiment",
       "version": "1.0.0",
       "dependencies": {
         "@aws-sdk/client-comprehend": "^3.335.0",
@@ -174,6 +202,7 @@
       }
     },
     "../../libs/sqs": {
+      "name": "@crowd/sqs",
       "version": "1.0.0",
       "dependencies": {
         "@aws-sdk/client-sqs": "^3.332.0",
@@ -194,6 +223,7 @@
       }
     },
     "../../libs/types": {
+      "name": "@crowd/types",
       "version": "1.0.0",
       "devDependencies": {
         "@types/node": "^18.16.3",
@@ -251,6 +281,10 @@
       "resolved": "../../libs/logging",
       "link": true
     },
+    "node_modules/@crowd/redis": {
+      "resolved": "../../libs/redis",
+      "link": true
+    },
     "node_modules/@crowd/sentiment": {
       "resolved": "../../libs/sentiment",
       "link": true
@@ -2646,6 +2680,7 @@
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^4.2.1",
         "prettier": "^2.8.8",
+        "psl": "^1.9.0",
         "typescript": "^5.0.4",
         "uuid": "^9.0.0"
       }
@@ -2727,6 +2762,23 @@
         "typescript": "^5.0.4"
       }
     },
+    "@crowd/redis": {
+      "version": "file:../../libs/redis",
+      "requires": {
+        "@crowd/common": "file:../common",
+        "@crowd/logging": "file:../logging",
+        "@crowd/types": "file:../types",
+        "@types/node": "^18.16.3",
+        "@typescript-eslint/eslint-plugin": "^5.59.2",
+        "@typescript-eslint/parser": "^5.59.2",
+        "eslint": "^8.39.0",
+        "eslint-config-prettier": "^8.8.0",
+        "eslint-plugin-prettier": "^4.2.1",
+        "prettier": "^2.8.8",
+        "redis": "^4.6.6",
+        "typescript": "^5.0.4"
+      }
+    },
     "@crowd/sentiment": {
       "version": "file:../../libs/sentiment",
       "requires": {
diff --git a/services/apps/data_sink_worker/package.json b/services/apps/data_sink_worker/package.json
index 99b58bc7aa..ec03e182b6 100644
--- a/services/apps/data_sink_worker/package.json
+++ b/services/apps/data_sink_worker/package.json
@@ -27,6 +27,7 @@
     "@crowd/logging": "file:../../libs/logging",
     "@crowd/sentiment": "file:../../libs/sentiment",
     "@crowd/sqs": "file:../../libs/sqs",
+    "@crowd/redis": "file:../../libs/redis",
     "@crowd/types": "file:../../libs/types",
     "@crowd/alerting": "file:../../libs/alerting",
     "@types/config": "^3.3.0",
diff --git a/services/apps/data_sink_worker/src/conf/index.ts b/services/apps/data_sink_worker/src/conf/index.ts
index 56b243bea5..962d745fd9 100644
--- a/services/apps/data_sink_worker/src/conf/index.ts
+++ b/services/apps/data_sink_worker/src/conf/index.ts
@@ -1,3 +1,4 @@
+import { IRedisConfiguration } from './../../../../libs/redis/src/types'
 import { IDatabaseConfig } from '@crowd/database'
 import { ISqsClientConfig } from '@crowd/sqs'
 import { ISentimentClientConfig } from '@crowd/sentiment'
@@ -7,6 +8,14 @@ export interface ISlackAlertingConfig {
   url: string
 }
 
+let redisConfig: IRedisConfiguration
+export const REDIS_CONFIG = (): IRedisConfiguration => {
+  if (redisConfig) return redisConfig
+
+  redisConfig = config.get<IRedisConfiguration>('redis')
+  return redisConfig
+}
+
 let sqsConfig: ISqsClientConfig
 export const SQS_CONFIG = (): ISqsClientConfig => {
   if (sqsConfig) return sqsConfig
diff --git a/services/apps/data_sink_worker/src/main.ts b/services/apps/data_sink_worker/src/main.ts
index f2c4d99319..930a2ac888 100644
--- a/services/apps/data_sink_worker/src/main.ts
+++ b/services/apps/data_sink_worker/src/main.ts
@@ -1,9 +1,10 @@
 import { getDbConnection } from '@crowd/database'
 import { getServiceLogger } from '@crowd/logging'
 import { NodejsWorkerEmitter, SearchSyncWorkerEmitter, getSqsClient } from '@crowd/sqs'
-import { DB_CONFIG, SENTIMENT_CONFIG, SQS_CONFIG } from './conf'
+import { DB_CONFIG, SENTIMENT_CONFIG, SQS_CONFIG, REDIS_CONFIG } from './conf'
 import { WorkerQueueReceiver } from './queue'
 import { initializeSentimentAnalysis } from '@crowd/sentiment'
+import { getRedisClient } from '@crowd/redis'
 
 const log = getServiceLogger()
 
@@ -16,6 +17,8 @@ setImmediate(async () => {
 
   const dbConnection = await getDbConnection(DB_CONFIG(), MAX_CONCURRENT_PROCESSING)
 
+  const redisClient = await getRedisClient(REDIS_CONFIG())
+
   if (SENTIMENT_CONFIG()) {
     initializeSentimentAnalysis(SENTIMENT_CONFIG())
   }
@@ -28,6 +31,7 @@ setImmediate(async () => {
     dbConnection,
     nodejsWorkerEmitter,
     searchSyncWorkerEmitter,
+    redisClient,
     log,
     MAX_CONCURRENT_PROCESSING,
   )
diff --git a/services/apps/data_sink_worker/src/queue/index.ts b/services/apps/data_sink_worker/src/queue/index.ts
index b27af043f1..ddba42e969 100644
--- a/services/apps/data_sink_worker/src/queue/index.ts
+++ b/services/apps/data_sink_worker/src/queue/index.ts
@@ -13,6 +13,7 @@ import {
   ProcessIntegrationResultQueueMessage,
 } from '@crowd/types'
 import DataSinkService from '../service/dataSink.service'
+import { RedisClient } from '@crowd/redis'
 
 export class WorkerQueueReceiver extends SqsQueueReceiver {
   constructor(
@@ -20,6 +21,7 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
     private readonly dbConn: DbConnection,
     private readonly nodejsWorkerEmitter: NodejsWorkerEmitter,
     private readonly searchSyncWorkerEmitter: SearchSyncWorkerEmitter,
+    private readonly redisClient: RedisClient,
     parentLog: Logger,
     maxConcurrentProcessing: number,
   ) {
@@ -34,6 +36,7 @@ export class WorkerQueueReceiver extends SqsQueueReceiver {
         new DbStore(this.log, this.dbConn),
         this.nodejsWorkerEmitter,
         this.searchSyncWorkerEmitter,
+        this.redisClient,
         this.log,
       )
 
diff --git a/services/apps/data_sink_worker/src/service/activity.service.ts b/services/apps/data_sink_worker/src/service/activity.service.ts
index dba85683bb..3caccbc56f 100644
--- a/services/apps/data_sink_worker/src/service/activity.service.ts
+++ b/services/apps/data_sink_worker/src/service/activity.service.ts
@@ -15,6 +15,13 @@ import SettingsRepository from './settings.repo'
 import { ConversationService } from '@crowd/conversations'
 import IntegrationRepository from '@/repo/integration.repo'
 import MemberAffiliationService from './memberAffiliation.service'
+import { acquireLock, releaseLock } from '@crowd/redis'
+import { RedisClient } from '@crowd/redis'
+
+const DEFAULT_EXPIRE_AFTER = 15 * 60 // 15 minutes
+const DEFAULT_TIMEOUT_AFTER = DEFAULT_EXPIRE_AFTER // 10 minutes
+const MEMBER_LOCK_EXPIRE_AFTER = 10 * 60 // 10 minutes
+const MEMBER_LOCK_TIMEOUT_AFTER = 5 * 60 // 5 minutes
 
 export default class ActivityService extends LoggerBase {
   private readonly conversationService: ConversationService
@@ -23,6 +30,7 @@ export default class ActivityService extends LoggerBase {
     private readonly store: DbStore,
     private readonly nodejsWorkerEmitter: NodejsWorkerEmitter,
     private readonly searchSyncWorkerEmitter: SearchSyncWorkerEmitter,
+    private readonly redisClient: RedisClient,
     parentLog: Logger,
   ) {
     super(parentLog)
@@ -378,6 +386,7 @@ export default class ActivityService extends LoggerBase {
           txStore,
           this.nodejsWorkerEmitter,
           this.searchSyncWorkerEmitter,
+          this.redisClient,
           this.log,
         )
         const txIntegrationRepo = new IntegrationRepository(txStore, this.log)
@@ -386,6 +395,15 @@ export default class ActivityService extends LoggerBase {
         const dbIntegration = await txIntegrationRepo.findById(integrationId)
         const segmentId = dbIntegration.segmentId
 
+        // acquiring lock for activity - we gonna hold it until transaction is done
+        await acquireLock(
+          this.redisClient,
+          `activity:processing:${tenantId}:${segmentId}:${activity.sourceId}`,
+          'check-activity',
+          DEFAULT_EXPIRE_AFTER,
+          DEFAULT_TIMEOUT_AFTER,
+        )
+
         // find existing activity
         const dbActivity = await txRepo.findExisting(tenantId, segmentId, activity.sourceId)
 
@@ -394,6 +412,16 @@ export default class ActivityService extends LoggerBase {
         if (dbActivity) {
           this.log.trace({ activityId: dbActivity.id }, 'Found existing activity. Updating it.')
           // process member data
+
+          // acquiring lock for member inside activity exists
+          await acquireLock(
+            this.redisClient,
+            `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+            'check-member-inside-activity-exists',
+            MEMBER_LOCK_EXPIRE_AFTER,
+            MEMBER_LOCK_TIMEOUT_AFTER,
+          )
+
           let dbMember = await txMemberRepo.findMember(tenantId, segmentId, platform, username)
           if (dbMember) {
             // we found a member for the identity from the activity
@@ -439,6 +467,13 @@ export default class ActivityService extends LoggerBase {
               false,
             )
 
+            // release lock for member inside activity exists right after we update the member
+            await releaseLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+              'check-member-inside-activity-exists',
+            )
+
             if (!createActivity) {
               // and use it's member id for the new activity
               dbActivity.memberId = dbMember.id
@@ -476,6 +511,13 @@ export default class ActivityService extends LoggerBase {
               false,
             )
 
+            // release lock for member inside activity exists right after we update the member
+            await releaseLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+              'check-member-inside-activity-exists',
+            )
+
             memberId = dbActivity.memberId
           }
 
@@ -489,6 +531,15 @@ export default class ActivityService extends LoggerBase {
           }
 
           if (objectMember) {
+            // checking objectMember
+            await acquireLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${objectMemberUsername}`,
+              'check-object-member-inside-activity-exists',
+              MEMBER_LOCK_EXPIRE_AFTER,
+              MEMBER_LOCK_TIMEOUT_AFTER,
+            )
+
             if (dbActivity.objectMemberId) {
               let dbObjectMember = await txMemberRepo.findMember(
                 tenantId,
@@ -584,6 +635,13 @@ export default class ActivityService extends LoggerBase {
                 objectMemberId = dbActivity.objectMemberId
               }
             }
+
+            // remove lock for objectMember
+            await releaseLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${objectMemberUsername}`,
+              'check-object-member-inside-activity-exists',
+            )
           }
 
           if (!createActivity) {
@@ -621,10 +679,26 @@ export default class ActivityService extends LoggerBase {
 
             activityId = dbActivity.id
           }
+
+          // release lock for member inside activity exists - this migth be redundant, but just in case
+          await releaseLock(
+            this.redisClient,
+            `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+            'check-member-inside-activity-exists',
+          )
         } else {
           this.log.trace('We did not find an existing activity. Creating a new one.')
           createActivity = true
 
+          // acquiring lock for member inside activity does not exist
+          await acquireLock(
+            this.redisClient,
+            `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+            'check-member-inside-activity-does-not-exist',
+            MEMBER_LOCK_EXPIRE_AFTER,
+            MEMBER_LOCK_TIMEOUT_AFTER,
+          )
+
           // we don't have the activity yet in the database
           // check if we have a member for the identity from the activity
           const dbMember = await txMemberRepo.findMember(tenantId, segmentId, platform, username)
@@ -649,6 +723,13 @@ export default class ActivityService extends LoggerBase {
               false,
             )
             memberId = dbMember.id
+
+            // release lock for member inside activity does not exist right after we update the member
+            await releaseLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+              'check-member-inside-activity-does-not-exist',
+            )
           } else {
             this.log.trace(
               'We did not find a member for the identity provided! Creating a new one.',
@@ -670,11 +751,28 @@ export default class ActivityService extends LoggerBase {
               },
               false,
             )
+
+            // release lock for member inside activity does not exist right after we create the member
+            await releaseLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+              'check-member-inside-activity-does-not-exist',
+            )
           }
 
           if (objectMember) {
             // we don't have the activity yet in the database
             // check if we have an object member for the identity from the activity
+
+            // acquiring lock for objectMember inside activity does not exist
+            await acquireLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${objectMemberUsername}`,
+              'check-object-member-inside-activity-does-not-exist',
+              MEMBER_LOCK_EXPIRE_AFTER,
+              MEMBER_LOCK_TIMEOUT_AFTER,
+            )
+
             const dbObjectMember = await txMemberRepo.findMember(
               tenantId,
               segmentId,
@@ -724,7 +822,21 @@ export default class ActivityService extends LoggerBase {
                 false,
               )
             }
+
+            // release lock for objectMember inside activity does not exist
+            await releaseLock(
+              this.redisClient,
+              `member:processing:${tenantId}:${segmentId}:${platform}:${objectMemberUsername}`,
+              'check-object-member-inside-activity-does-not-exist',
+            )
           }
+
+          // release lock for member inside activity does not exist
+          await releaseLock(
+            this.redisClient,
+            `member:processing:${tenantId}:${segmentId}:${platform}:${username}`,
+            'check-member-inside-activity-does-not-exist',
+          )
         }
 
         if (createActivity) {
@@ -759,6 +871,13 @@ export default class ActivityService extends LoggerBase {
             false,
           )
         }
+
+        // release activity lock
+        await releaseLock(
+          this.redisClient,
+          `activity:processing:${tenantId}:${segmentId}:${activity.sourceId}`,
+          'check-activity',
+        )
       })
 
       await this.searchSyncWorkerEmitter.triggerMemberSync(tenantId, memberId)
diff --git a/services/apps/data_sink_worker/src/service/dataSink.service.ts b/services/apps/data_sink_worker/src/service/dataSink.service.ts
index 8894de2be7..03fc09023b 100644
--- a/services/apps/data_sink_worker/src/service/dataSink.service.ts
+++ b/services/apps/data_sink_worker/src/service/dataSink.service.ts
@@ -14,6 +14,7 @@ import MemberService from './member.service'
 import { SLACK_ALERTING_CONFIG } from '@/conf'
 import { sendSlackAlert, SlackAlertTypes } from '@crowd/alerting'
 import { OrganizationService } from './organization.service'
+import { RedisClient } from '@crowd/redis'
 
 export default class DataSinkService extends LoggerBase {
   private readonly repo: DataSinkRepository
@@ -22,6 +23,7 @@ export default class DataSinkService extends LoggerBase {
     private readonly store: DbStore,
     private readonly nodejsWorkerEmitter: NodejsWorkerEmitter,
     private readonly searchSyncWorkerEmitter: SearchSyncWorkerEmitter,
+    private readonly redisClient: RedisClient,
     parentLog: Logger,
   ) {
     super(parentLog)
@@ -88,6 +90,7 @@ export default class DataSinkService extends LoggerBase {
             this.store,
             this.nodejsWorkerEmitter,
             this.searchSyncWorkerEmitter,
+            this.redisClient,
             this.log,
           )
           const activityData = data.data as IActivityData
diff --git a/services/apps/search_sync_worker/src/service/member.sync.service.ts b/services/apps/search_sync_worker/src/service/member.sync.service.ts
index b0e9bc0d20..fd904cd9e6 100644
--- a/services/apps/search_sync_worker/src/service/member.sync.service.ts
+++ b/services/apps/search_sync_worker/src/service/member.sync.service.ts
@@ -300,38 +300,38 @@ export class MemberSyncService extends LoggerBase {
               id: `${memberId}-${member.segmentId}`,
               body: prepared,
             })
-          }
-
-          const relevantSegmentInfos = segmentInfos.filter((s) => s.id === memberDocs[0].segmentId)
 
-          // and for each parent and grandparent
-          const parentIds = distinct(relevantSegmentInfos.map((s) => s.parentId))
-          for (const parentId of parentIds) {
-            const aggregated = MemberSyncService.aggregateData(
-              memberDocs,
-              relevantSegmentInfos,
-              parentId,
-            )
-            const prepared = MemberSyncService.prefixData(aggregated, attributes)
-            forSync.push({
-              id: `${memberId}-${parentId}`,
-              body: prepared,
-            })
-          }
+            const relevantSegmentInfos = segmentInfos.filter((s) => s.id === member.segmentId)
+
+            // and for each parent and grandparent
+            const parentIds = distinct(relevantSegmentInfos.map((s) => s.parentId))
+            for (const parentId of parentIds) {
+              const aggregated = MemberSyncService.aggregateData(
+                memberDocs,
+                relevantSegmentInfos,
+                parentId,
+              )
+              const prepared = MemberSyncService.prefixData(aggregated, attributes)
+              forSync.push({
+                id: `${memberId}-${parentId}`,
+                body: prepared,
+              })
+            }
 
-          const grandParentIds = distinct(relevantSegmentInfos.map((s) => s.grandParentId))
-          for (const grandParentId of grandParentIds) {
-            const aggregated = MemberSyncService.aggregateData(
-              memberDocs,
-              relevantSegmentInfos,
-              undefined,
-              grandParentId,
-            )
-            const prepared = MemberSyncService.prefixData(aggregated, attributes)
-            forSync.push({
-              id: `${memberId}-${grandParentId}`,
-              body: prepared,
-            })
+            const grandParentIds = distinct(relevantSegmentInfos.map((s) => s.grandParentId))
+            for (const grandParentId of grandParentIds) {
+              const aggregated = MemberSyncService.aggregateData(
+                memberDocs,
+                relevantSegmentInfos,
+                undefined,
+                grandParentId,
+              )
+              const prepared = MemberSyncService.prefixData(aggregated, attributes)
+              forSync.push({
+                id: `${memberId}-${grandParentId}`,
+                body: prepared,
+              })
+            }
           }
         } else {
           if (memberDocs.length > 1) {
diff --git a/services/apps/search_sync_worker/src/service/organization.sync.service.ts b/services/apps/search_sync_worker/src/service/organization.sync.service.ts
index 1e27ee8753..c78035fa41 100644
--- a/services/apps/search_sync_worker/src/service/organization.sync.service.ts
+++ b/services/apps/search_sync_worker/src/service/organization.sync.service.ts
@@ -269,47 +269,45 @@ export class OrganizationSyncService extends LoggerBase {
       for (const organizationId of organizationIds) {
         const organizationDocs = grouped.get(organizationId)
         if (isMultiSegment) {
-          // index each of them individually
           for (const organization of organizationDocs) {
+            // index each of them individually because it's per leaf segment
             const prepared = OrganizationSyncService.prefixData(organization)
             forSync.push({
               id: `${organizationId}-${organization.segmentId}`,
               body: prepared,
             })
-          }
-
-          const relevantSegmentInfos = segmentInfos.filter(
-            (s) => s.id === organizationDocs[0].segmentId,
-          )
 
-          // and for each parent and grandparent
-          const parentIds = distinct(relevantSegmentInfos.map((s) => s.parentId))
-          for (const parentId of parentIds) {
-            const aggregated = OrganizationSyncService.aggregateData(
-              organizationDocs,
-              relevantSegmentInfos,
-              parentId,
-            )
-            const prepared = OrganizationSyncService.prefixData(aggregated)
-            forSync.push({
-              id: `${organizationId}-${parentId}`,
-              body: prepared,
-            })
-          }
-
-          const grandParentIds = distinct(relevantSegmentInfos.map((s) => s.grandParentId))
-          for (const grandParentId of grandParentIds) {
-            const aggregated = OrganizationSyncService.aggregateData(
-              organizationDocs,
-              relevantSegmentInfos,
-              undefined,
-              grandParentId,
-            )
-            const prepared = OrganizationSyncService.prefixData(aggregated)
-            forSync.push({
-              id: `${organizationId}-${grandParentId}`,
-              body: prepared,
-            })
+            const relevantSegmentInfos = segmentInfos.filter((s) => s.id === organization.segmentId)
+
+            // and for each parent and grandparent
+            const parentIds = distinct(relevantSegmentInfos.map((s) => s.parentId))
+            for (const parentId of parentIds) {
+              const aggregated = OrganizationSyncService.aggregateData(
+                organizationDocs,
+                relevantSegmentInfos,
+                parentId,
+              )
+              const prepared = OrganizationSyncService.prefixData(aggregated)
+              forSync.push({
+                id: `${organizationId}-${parentId}`,
+                body: prepared,
+              })
+            }
+
+            const grandParentIds = distinct(relevantSegmentInfos.map((s) => s.grandParentId))
+            for (const grandParentId of grandParentIds) {
+              const aggregated = OrganizationSyncService.aggregateData(
+                organizationDocs,
+                relevantSegmentInfos,
+                undefined,
+                grandParentId,
+              )
+              const prepared = OrganizationSyncService.prefixData(aggregated)
+              forSync.push({
+                id: `${organizationId}-${grandParentId}`,
+                body: prepared,
+              })
+            }
           }
         } else {
           if (organizationDocs.length > 1) {
diff --git a/services/libs/common/src/types.ts b/services/libs/common/src/types.ts
index edcb7d9e57..f75dd2163c 100644
--- a/services/libs/common/src/types.ts
+++ b/services/libs/common/src/types.ts
@@ -4,3 +4,10 @@ export interface PageData<T> {
   limit: number
   offset: number
 }
+
+export class TimeoutError extends Error {
+  constructor(public readonly timeout: number, public readonly unit: string) {
+    super(`Process timeout after ${timeout} ${unit}!`)
+    Object.setPrototypeOf(this, TimeoutError.prototype)
+  }
+}
diff --git a/services/libs/redis/src/index.ts b/services/libs/redis/src/index.ts
index c1a73aa123..ad58a1c787 100644
--- a/services/libs/redis/src/index.ts
+++ b/services/libs/redis/src/index.ts
@@ -5,3 +5,4 @@ export * from './cache'
 
 export * from './instances'
 export * from './rateLimiter'
+export * from './mutex'
diff --git a/services/libs/redis/src/mutex.ts b/services/libs/redis/src/mutex.ts
new file mode 100644
index 0000000000..ac9a1e5b1e
--- /dev/null
+++ b/services/libs/redis/src/mutex.ts
@@ -0,0 +1,73 @@
+import { TimeoutError, timeout } from '@crowd/common'
+import { RedisClient } from './types'
+import { generateUUIDv4 } from '@crowd/common'
+
+export const acquireLock = async (
+  client: RedisClient,
+  key: string,
+  value: string,
+  expireAfterSeconds: number,
+  timeoutAfterSeconds: number,
+): Promise<void> => {
+  const now = new Date().getTime()
+
+  let result = await client.set(key, value, {
+    EX: expireAfterSeconds,
+    NX: true,
+  })
+  while (!result) {
+    const time = new Date().getTime()
+    const diff = time - now
+    if (diff > timeoutAfterSeconds * 1000) {
+      throw new TimeoutError(diff / 1000, 's')
+    }
+
+    // Randomize timeout between 100ms and 300ms
+    const randomTimeout = Math.floor(Math.random() * (300 - 100 + 1)) + 100
+    await timeout(randomTimeout)
+    result = await client.set(key, value, {
+      EX: expireAfterSeconds,
+      NX: true,
+    })
+  }
+}
+
+export const releaseLock = async (
+  client: RedisClient,
+  key: string,
+  value: string,
+): Promise<void> => {
+  const script = `
+    if redis.call("get",KEYS[1]) == ARGV[1] then
+      return redis.call("del",KEYS[1])
+    else
+      return 0
+    end
+  `
+  await client.eval(script, {
+    keys: [key],
+    arguments: [value],
+  })
+}
+
+export const processWithLock = async <T = void>(
+  client: RedisClient,
+  key: string,
+  expireAfterSeconds: number,
+  timeoutAfterSeconds: number,
+  process: () => Promise<T>,
+): Promise<T | void> => {
+  const value = generateUUIDv4()
+
+  await acquireLock(client, key, value, expireAfterSeconds, timeoutAfterSeconds)
+
+  // TODO: we can add logic to extend the lock here if we want to
+
+  let result: T | void
+  try {
+    result = await process()
+  } finally {
+    await releaseLock(client, key, value)
+  }
+  return result
+}