diff --git a/docs/providers/documentation/ilert-provider.mdx b/docs/providers/documentation/ilert-provider.mdx
index f8676a395..cd53fce11 100644
--- a/docs/providers/documentation/ilert-provider.mdx
+++ b/docs/providers/documentation/ilert-provider.mdx
@@ -1,9 +1,9 @@
 ---
-title: "Ilert Provider"
-sidebarTitle: "Ilert Provider"
+title: "ilert Provider"
+sidebarTitle: "ilert Provider"
 description: "The ilert provider enables the creation, updating, and resolution of events or incidents on ilert, leveraging both incident management and event notification capabilities for effective incident response."
 ---
-# Ilert Provider
+# ilert Provider
 
 ## Overview
 
@@ -21,7 +21,7 @@ Depending on the `_type` specified, the provider will route the operation to the
 ### Incident Management
 
 - `summary`: A brief summary of the incident. This is required for creating a new incident.
-- `status`: `IlertIncidentStatus` - The current status of the incident (e.g., INVESTIGATING, RESOLVED, MONITORING, IDENTIFIED).
+- `status`: `ilertIncidentStatus` - The current status of the incident (e.g., INVESTIGATING, RESOLVED, MONITORING, IDENTIFIED).
 - `message`: A detailed message describing the incident or situation. Default is an empty string.
 - `affectedServices`: A JSON string representing the list of affected services and their statuses. Default is an empty array (`"[]"`).
 - `id`: The ID of the incident to update. If set to `"0"`, a new incident will be created.
@@ -69,5 +69,5 @@ This provider is part of Keep's integration with ilert, designed to enhance oper
 
 ## Useful Links
 
-- [ilert API Documentation](https://api.ilert.com/api-docs/)
-- [ilert Alerting](https://www.ilert.com/product/reliable-actionable-alerting)
+- [ilert API Documentation](https://api.ilert.com/api-docs/?utm_campaign=Keep&utm_source=integration&utm_medium=organic)
+- [ilert Alerting](https://www.ilert.com/product/reliable-actionable-alerting?utm_campaign=Keep&utm_source=integration&utm_medium=organic)
diff --git a/docs/providers/overview.mdx b/docs/providers/overview.mdx
index 7a45033ce..49069603c 100644
--- a/docs/providers/overview.mdx
+++ b/docs/providers/overview.mdx
@@ -181,7 +181,7 @@ By leveraging Keep Providers, users are able to deeply integrate Keep with the t
 ></Card>
 
 <Card
-  title="Ilert"
+  title="ilert"
   href="/providers/documentation/ilert-provider"
   icon={
     <img src="https://img.logo.dev/ilert.com?token=pk_dfXfZBoKQMGDTIgqu7LvYg" />
diff --git a/keep-ui/app/dashboard/GridLayout.tsx b/keep-ui/app/dashboard/GridLayout.tsx
index 9a33bfb0c..89ed7e4db 100644
--- a/keep-ui/app/dashboard/GridLayout.tsx
+++ b/keep-ui/app/dashboard/GridLayout.tsx
@@ -3,6 +3,7 @@ import { Responsive, WidthProvider, Layout } from "react-grid-layout";
 import GridItemContainer from "./GridItemContainer";
 import { LayoutItem, WidgetData } from "./types";
 import "react-grid-layout/css/styles.css";
+import { Preset } from "app/alerts/models";
 
 const ResponsiveGridLayout = WidthProvider(Responsive);
 
@@ -12,9 +13,10 @@ interface GridLayoutProps {
   data: WidgetData[];
   onEdit: (id: string) => void;
   onDelete: (id: string) => void;
+  presets: Preset[];
 }
 
-const GridLayout: React.FC<GridLayoutProps> = ({ layout, onLayoutChange, data, onEdit, onDelete }) => {
+const GridLayout: React.FC<GridLayoutProps> = ({ layout, onLayoutChange, data, onEdit, onDelete, presets }) => {
   const layouts = { lg: layout };
 
   return (
@@ -39,11 +41,15 @@ const GridLayout: React.FC<GridLayoutProps> = ({ layout, onLayoutChange, data, o
       compactType={null}
       draggableHandle=".grid-item__widget"
     >
-      {data.map((item) => (
-        <div key={item.i} data-grid={item}>
-          <GridItemContainer item={item} onEdit={onEdit} onDelete={onDelete} />
-        </div>
-      ))}
+      {data.map((item) => {
+          //Fixing the static hardcode db value.
+          const preset = presets?.find(p => p?.id === item?.preset?.id);
+          item.preset = { ...item.preset,alerts_count: preset?.alerts_count ?? 0};
+        return (
+          <div key={item.i} data-grid={item}>
+            <GridItemContainer item={item} onEdit={onEdit} onDelete={onDelete} />
+          </div>
+      )})}
     </ResponsiveGridLayout>
   );
 };
diff --git a/keep-ui/app/dashboard/[id]/dashboard.tsx b/keep-ui/app/dashboard/[id]/dashboard.tsx
index 535f06e64..f9d4009de 100644
--- a/keep-ui/app/dashboard/[id]/dashboard.tsx
+++ b/keep-ui/app/dashboard/[id]/dashboard.tsx
@@ -13,12 +13,21 @@ import { useDashboards } from 'utils/hooks/useDashboards';
 import { getApiURL } from 'utils/apiUrl';
 import './../styles.css';
 import { toast } from 'react-toastify';
+import { GenericFilters } from '@/components/filters/GenericFilters';
+import { useDashboardPreset } from 'utils/hooks/useDashboardPresets';
+
+const DASHBOARD_FILTERS = [
+  {
+    type: "date",
+    key: "time_stamp",
+    value: "",
+    name: "Last received",
+  }
+]
 
 const DashboardPage = () => {
-  const { useAllPresets, useStaticPresets } = usePresets();
-  const { data: presets = [] } = useAllPresets();
-  const { data: staticPresets = [] } = useStaticPresets();
-  const { id } : any = useParams();
+  const allPresets = useDashboardPreset();
+  const { id }: any = useParams();
   const { data: session } = useSession();
   const { dashboards, isLoading, mutate: mutateDashboard } = useDashboards();
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -39,8 +48,6 @@ const DashboardPage = () => {
     }
   }, [id, dashboards, isLoading]);
 
-  const allPresets = [...presets, ...staticPresets];
-
   const openModal = () => {
     setEditingItem(null); // Ensure new modal opens without editing item context
     setIsModalOpen(true);
@@ -163,6 +170,8 @@ const DashboardPage = () => {
             color="orange"
           />
         </div>
+        <div className="flex gap-1 items-end">
+        <GenericFilters filters={DASHBOARD_FILTERS} />
         <div className="flex">
           <Button
             icon={FiSave}
@@ -173,6 +182,7 @@ const DashboardPage = () => {
           />
           <Button color="orange" onClick={openModal} className="ml-2">Add Widget</Button>
         </div>
+        </div>
       </div>
       {layout.length === 0 ? (
         <Card
@@ -192,6 +202,7 @@ const DashboardPage = () => {
             data={widgetData}
             onEdit={handleEditWidget}
             onDelete={handleDeleteWidget}
+            presets={allPresets}
           />
         </Card>
       )}
diff --git a/keep-ui/app/mapping/create-or-edit-mapping.tsx b/keep-ui/app/mapping/create-or-edit-mapping.tsx
index 870a81a53..8109c8061 100644
--- a/keep-ui/app/mapping/create-or-edit-mapping.tsx
+++ b/keep-ui/app/mapping/create-or-edit-mapping.tsx
@@ -329,9 +329,14 @@ export default function CreateOrEditMapping({ editRule, editCallback }: Props) {
             <Badge color="gray">...</Badge>
           ) : (
             attributes
-              .filter(
-                (attribute) => !selectedLookupAttributes.includes(attribute)
-              )
+              .filter((attribute) => {
+                return !selectedLookupAttributes.some((lookupAttr) => {
+                  const parts = lookupAttr
+                    .split("&&")
+                    .map((part) => part.trim());
+                  return parts.includes(attribute);
+                });
+              })
               .map((attribute) => (
                 <Badge key={attribute} color="orange">
                   {attribute}
diff --git a/keep-ui/components/filters/GenericFilters.tsx b/keep-ui/components/filters/GenericFilters.tsx
new file mode 100644
index 000000000..7d30e9f6c
--- /dev/null
+++ b/keep-ui/components/filters/GenericFilters.tsx
@@ -0,0 +1,339 @@
+import GenericPopover from "@/components/popover/GenericPopover";
+import { Textarea, Badge, Button, Tab, TabGroup, TabList } from "@tremor/react";
+import moment from "moment";
+import { usePathname, useSearchParams, useRouter } from "next/navigation";
+import { useRef, useState, useEffect, ChangeEvent } from "react";
+import { GoPlusCircle } from "react-icons/go";
+import { DateRangePicker, DateRangePickerValue, Title } from "@tremor/react";
+import { MdOutlineDateRange } from "react-icons/md";
+import { IconType } from "react-icons";
+import { endOfDay } from "date-fns";
+
+
+type Filter = {
+  key: string;
+  value: string | string[] | Record<string, string>;
+  type: string;
+  options?: { value: string; label: string }[];
+  name: string;
+  icon?: IconType;
+};
+
+interface FiltersProps {
+  filters: Filter[];
+}
+
+interface PopoverContentProps {
+  filterRef: React.MutableRefObject<Filter[]>;
+  filterKey: string;
+  type: string;
+}
+
+function toArray(value: string | string[]) {
+  if (!value) return [];
+
+  if (!Array.isArray(value) && value) {
+    return [value];
+  }
+  return value;
+}
+
+// TODO: Testing is needed
+function CustomSelect({
+  filter,
+  setLocalFilter,
+}: {
+  filter: Filter | null;
+  setLocalFilter: (value: string | string[]) => void;
+}) {
+  const filterKey = filter?.key || "";
+  const [selectedOptions, setSelectedOptions] = useState<Set<string>>(
+    new Set<string>()
+  );
+
+  useEffect(() => {
+    if (filter) {
+      setSelectedOptions(new Set(toArray(filter.value as string | string[])));
+    }
+  }, [filter]);
+
+  const handleCheckboxChange = (option: string, checked: boolean) => {
+    setSelectedOptions((prev) => {
+      const updatedOptions = new Set(prev);
+      if (checked) {
+        updatedOptions.add(option);
+      } else {
+        updatedOptions.delete(option);
+      }
+      if (filter) {
+        setLocalFilter(Array.from(updatedOptions));
+        // setFilter((prev) => ({ ...prev, ...filter }));
+      }
+      return updatedOptions;
+    });
+  };
+
+  if (!filter) {
+    return null;
+  }
+
+  return (
+    <>
+      <span className="text-gray-400 text-sm">
+        Select {filterKey?.charAt(0)?.toUpperCase() + filterKey?.slice(1)}
+      </span>
+      <ul className="flex flex-col mt-3 max-h-96 overflow-auto">
+        {filter.options?.map((option) => (
+          <li key={option.value}>
+            <label className="cursor-pointer p-2 flex items-center">
+              <input
+                className="mr-2"
+                type="checkbox"
+                onChange={(e: ChangeEvent<HTMLInputElement>) =>
+                  handleCheckboxChange(option.value, e.target.checked)
+                }
+                checked={selectedOptions.has(option.value)}
+              />
+              {option.label}
+            </label>
+          </li>
+        ))}
+      </ul>
+    </>
+  );
+}
+
+function getParsedValue(filter: Filter) {
+  const value = filter?.value as string;
+  if (!value) {
+    return 0;
+  }
+  if (typeof value !== "string") {
+    return 0;
+  }
+  try {
+    return JSON.parse(value) || {};
+  } catch (e) {
+    return 0;
+  }
+}
+
+function CustomDate({
+  filter,
+  handleDate,
+}: {
+  filter: Filter | null;
+  handleDate: (from?: Date, to?: Date) => void;
+}) {
+  const [dateRange, setDateRange] = useState<DateRangePickerValue>({
+    from: undefined,
+    to: undefined,
+  });
+
+  const onDateRangePickerChange = ({
+    from: start,
+    to: end,
+  }: DateRangePickerValue) => {
+    const endDate = end || start;
+    const endOfDayDate = endDate ? endOfDay(endDate) : end;
+
+
+    setDateRange({ from: start ?? undefined, to: endOfDayDate ?? undefined });
+    handleDate(start, endOfDayDate);
+  };
+
+  useEffect(() => {
+    if (filter) {
+      const filterValue = getParsedValue(filter!);
+      const from = filterValue.start ? new Date(filterValue.start) : undefined;
+      const to = filterValue.end ? new Date(filterValue.end) : undefined;
+      onDateRangePickerChange({ from, to });
+    }
+  }, [filter?.value]);
+
+  if (!filter) return null;
+
+  return (
+    <div className="flex justify-center items-center m-x-4">
+      <DateRangePicker
+        value={dateRange}
+        onValueChange={onDateRangePickerChange}
+        enableYearNavigation
+      />
+    </div>
+  );
+}
+
+const PopoverContent: React.FC<PopoverContentProps> = ({
+  filterRef,
+  filterKey,
+  type,
+}) => {
+  // Initialize local state for selected options
+
+  const filter = filterRef.current?.find((filter) => filter.key === filterKey);
+
+  const [localFilter, setLocalFilter] = useState<Filter | null>(null);
+
+  useEffect(() => {
+    if (filter) {
+      setLocalFilter({ ...filter });
+    }
+  }, []);
+
+  useEffect(() => {
+    if (localFilter && filter) {
+      filter.value = localFilter.value;
+    }
+  }, [localFilter?.value]);
+
+  const handleLocalFilter = (value: string | string[]) => {
+    if (filter) {
+      filter.value = value;
+    }
+    setLocalFilter((prev) => {
+      if (prev) {
+        return { ...prev, value };
+      }
+      return null;
+    });
+  };
+
+  const handleDate = (start?: Date, end?: Date) => {
+    let newValue = ""
+    if (!start && !end) {
+      newValue = "";
+    } else {
+      newValue = JSON.stringify({
+        start: start,
+        end: end || start,
+      });
+    }
+    if (filter) {
+      filter.value = newValue;
+    }
+    setLocalFilter((prev) => {
+      if (prev) {
+        return { ...prev, value: newValue };
+      }
+      return null;
+    });
+  };
+
+  // Return the appropriate content based on the selected type
+  switch (type) {
+    case "select":
+      return (
+        <CustomSelect filter={localFilter} setLocalFilter={handleLocalFilter} />
+      );
+    case "date":
+      return <CustomDate filter={localFilter} handleDate={handleDate} />;
+    default:
+      return null;
+  }
+};
+
+export const GenericFilters: React.FC<FiltersProps> = ({ filters }) => {
+  // Initialize filterRef to store filter values
+  const filterRef = useRef<Filter[]>(filters);
+  const router = useRouter();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+  const searchParamString = searchParams?.toString();
+  const [apply, setApply] = useState(false);
+
+  useEffect(() => {
+    if (apply && filterRef.current) {
+      const newParams = new URLSearchParams(
+        searchParams ? searchParams.toString() : ""
+      );
+      const keys = filterRef.current.map((filter) => filter.key);
+      keys.forEach((key) => newParams.delete(key));
+      for (const { key, value } of filterRef.current) {
+        if (Array.isArray(value)) {
+          for (const item of value) {
+            newParams.append(key, item);
+          }
+        } else if (value && typeof value === "string") {
+          newParams.append(key, value);
+        } else if (value && typeof value === "object") {
+          for (const [k, v] of Object.entries(value)) {
+            newParams.append(`$[${k}]`, v);
+          }
+        }
+      }
+
+      router.push(`${pathname}?${newParams.toString()}`);
+      setApply(false); // Reset apply state
+    }
+  }, [apply]);
+
+  useEffect(() => {
+    if (searchParams) {
+      // Convert URLSearchParams to a key-value pair object
+      const entries = Array.from(searchParams.entries());
+      const params = entries.reduce((acc, [key, value]) => {
+        if (key in acc) {
+          if (Array.isArray(acc[key])) {
+            acc[key] = [...acc[key], value];
+            return acc;
+          }else {
+            acc[key] = [acc[key] as string, value];
+          }
+          return acc;
+        }
+        acc[key] = value;
+        return acc;
+      }, {} as Record<string, string | string[]>);
+
+      // Update filterRef.current with the new params
+      filterRef.current = filters.map((filter) => ({
+        ...filter,
+        value: params[filter.key] || "",
+      }));
+    }
+  }, [searchParamString, filters]);
+  // Handle textarea value change
+  const onValueChange = (e: ChangeEvent<HTMLTextAreaElement>) => {
+    //to do handle the value change
+    e.preventDefault();
+    if (filterRef.current) {
+    }
+  };
+
+  // Handle key down event for textarea
+  const handleKeyDown = (e: any) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      setApply(true);
+    }
+  };
+
+  return (
+    <div className="relative flex flex-col md:flex-row lg:flex-row gap-4 items-center">
+      {filters &&
+        filters?.map(({ key, type, name, icon }) => {
+          //only type==select and date need popover i guess other text and textarea can be handled different. for now handling select and date
+          icon = icon ?? type === "date" ? MdOutlineDateRange : GoPlusCircle;
+          return (
+            <div key={key} className="flex gap-4">
+              <GenericPopover
+                triggerText={name}
+                triggerIcon={icon}
+                content={
+                  <PopoverContent
+                    filterRef={filterRef}
+                    filterKey={key}
+                    type={type}
+                  />
+                }
+                onApply={() => setApply(true)}
+              />
+            </div>
+          );
+        })}
+      {/* TODO : Add clear filters functionality */}
+      {/* <Button className="shadow-lg p-2" onClick={() => { filterRef.current = { trigger: [], status: [], execution_id: '' }; setApply(true) }}>Clear Filters</Button> */}
+    </div>
+  );
+};
diff --git a/keep-ui/components/popover/GenericPopover.tsx b/keep-ui/components/popover/GenericPopover.tsx
index f7bb1df07..bc990d1ce 100644
--- a/keep-ui/components/popover/GenericPopover.tsx
+++ b/keep-ui/components/popover/GenericPopover.tsx
@@ -63,7 +63,7 @@ const GenericPopover: React.FC<PopoverProps> = ({
                         />
                         {content}
                         <Button
-                            className="mt-5"
+                            className="mt-5 float-right"
                             color="orange"
                             onClick={() => {
                                 if (onApply) onApply();
diff --git a/keep-ui/utils/hooks/useDashboardPresets.ts b/keep-ui/utils/hooks/useDashboardPresets.ts
new file mode 100644
index 000000000..2f5cd0310
--- /dev/null
+++ b/keep-ui/utils/hooks/useDashboardPresets.ts
@@ -0,0 +1,43 @@
+import { useSession } from "next-auth/react";
+import { usePresets } from "./usePresets";
+import { Preset } from "app/alerts/models";
+import { useMemo } from "react";
+import { useSearchParams } from "next/navigation";
+
+export const useDashboardPreset = () => {
+  const { data: session } = useSession();
+
+  const { useAllPresets, useStaticPresets, presetsOrderFromLS, staticPresetsOrderFromLS } = usePresets(
+    "dashboard",
+    true
+  );
+  const { data: presets = [] } = useAllPresets({
+    revalidateIfStale: false,
+    revalidateOnFocus: false,
+  });
+  const { data: fetchedPresets = [] } = useStaticPresets({
+    revalidateIfStale: false,
+  });
+  const searchParams = useSearchParams();
+
+
+  const checkValidPreset = (preset: Preset) => {
+    if (!preset.is_private) {
+      return true;
+    }
+    return preset && preset.created_by == session?.user?.email;
+  };
+
+  let allPreset = useMemo(() => {
+    /*If any filters are applied on the dashboard, we will fetch live data; otherwise, 
+    we will use data from localStorage to sync values between the navbar and the dashboard.*/
+    let combinedPresets = searchParams?.toString() ? [...presets, ...fetchedPresets]: [...presetsOrderFromLS, ...staticPresetsOrderFromLS];
+    //private preset checks
+    combinedPresets = combinedPresets.filter((preset) =>
+      checkValidPreset(preset)
+    );
+    return combinedPresets;
+  }, [presets, fetchedPresets, searchParams, presets, fetchedPresets]);
+
+  return  allPreset;
+};
diff --git a/keep-ui/utils/hooks/usePresets.ts b/keep-ui/utils/hooks/usePresets.ts
index 3bfe9d4f3..18c5d4b1b 100644
--- a/keep-ui/utils/hooks/usePresets.ts
+++ b/keep-ui/utils/hooks/usePresets.ts
@@ -8,18 +8,25 @@ import { useLocalStorage } from "utils/hooks/useLocalStorage";
 import { useConfig } from "./useConfig";
 import useSWRSubscription from "swr/subscription";
 import { useWebsocket } from "./usePusher";
+import { usePathname, useSearchParams } from "next/navigation";
+import moment from "moment";
 
-export const usePresets = () => {
+export const usePresets = (type?: string, useFilters?: boolean) => {
   const { data: session } = useSession();
   const { data: configData } = useConfig();
   const apiUrl = getApiURL();
-
+  //ideally, we can use pathname. but hardcoding it for now.
+  const isDashBoard = type === "dashboard";
   const [presetsOrderFromLS, setPresetsOrderFromLS] = useLocalStorage<Preset[]>(
     "presets-order",
     []
   );
+  const searchParams = useSearchParams();
+
+  const newPresetsRef = useRef<Preset[] | null>(null);
+
   const [staticPresetsOrderFromLS, setStaticPresetsOrderFromLS] =
-    useLocalStorage<Preset[]>("static-presets-order", []);
+    useLocalStorage<Preset[]>(`static-presets-order`, []);
   // used to sync the presets with the server
   const [isLocalStorageReady, setIsLocalStorageReady] = useState(false);
   const presetsOrderRef = useRef(presetsOrderFromLS);
@@ -32,6 +39,9 @@ export const usePresets = () => {
   }, [presetsOrderFromLS, staticPresetsOrderFromLS]);
 
   const updateLocalPresets = (newPresets: Preset[]) => {
+    if (newPresetsRef) {
+      newPresetsRef.current = newPresets;
+    }
     const updatePresets = (currentPresets: Preset[], newPresets: Preset[]) => {
       const newPresetMap = new Map(newPresets.map((p) => [p.id, p]));
       let updatedPresets = new Map(currentPresets.map((p) => [p.id, p]));
@@ -57,7 +67,6 @@ export const usePresets = () => {
 
       return Array.from(updatedPresets.values());
     };
-
     setPresetsOrderFromLS((current) =>
       updatePresets(
         presetsOrderRef.current,
@@ -102,8 +111,14 @@ export const usePresets = () => {
   );
 
   const useFetchAllPresets = (options?: SWRConfiguration) => {
+    const filters = searchParams?.toString();
     return useSWR<Preset[]>(
-      () => (session ? `${apiUrl}/preset` : null),
+      () =>
+        session
+          ? `${apiUrl}/preset${
+              useFilters && filters && isDashBoard ? `?${filters}` : ""
+            }`
+          : null,
       (url) => fetcher(url, session?.accessToken),
       {
         ...options,
@@ -116,6 +131,12 @@ export const usePresets = () => {
             const staticPresets = data.filter((p) =>
               ["feed", "deleted", "dismissed", "groups"].includes(p.name)
             );
+
+            //if it is dashboard we don't need to merge with local storage.
+            //if we need to merge. we need maintain multiple local storage for each dahboard view which make it very complex to maintain.(if we have more dashboards)
+            if (isDashBoard) {
+              return;
+            }
             mergePresetsWithLocalStorage(
               dynamicPresets,
               presetsOrderFromLS,
@@ -206,5 +227,6 @@ export const usePresets = () => {
     presetsOrderFromLS,
     setPresetsOrderFromLS,
     staticPresetsOrderFromLS,
+    newPresetsRef,
   };
 };
diff --git a/keep/api/bl/enrichments_bl.py b/keep/api/bl/enrichments_bl.py
index d8f18691c..27311982b 100644
--- a/keep/api/bl/enrichments_bl.py
+++ b/keep/api/bl/enrichments_bl.py
@@ -294,11 +294,16 @@ def _check_alert_matches_rule(self, alert: AlertDto, rule: MappingRule) -> bool:
                     for matcher in rule.matchers
                 ):
                     # Extract enrichments from the matched row
-                    enrichments = {
-                        key: value
-                        for key, value in row.items()
-                        if key not in rule.matchers and value is not None
-                    }
+                    enrichments = {}
+                    for key, value in row.items():
+                        if value is not None:
+                            is_matcher = False
+                            for matcher in rule.matchers:
+                                if key in matcher.replace(" ", "").split("&&"):
+                                    is_matcher = True
+                                    break
+                            if not is_matcher:
+                                enrichments[key] = value
                     break
 
         if enrichments:
diff --git a/keep/api/core/db.py b/keep/api/core/db.py
index 13f9b1ddc..4354d4f27 100644
--- a/keep/api/core/db.py
+++ b/keep/api/core/db.py
@@ -1203,6 +1203,7 @@ def get_last_alerts(
         if lower_timestamp is not None:
             filter_conditions.append(subquery.c.max_timestamp >= lower_timestamp)
 
+        logger.info(f"filter_conditions: {filter_conditions}")
         # Apply the filter conditions
         if filter_conditions:
             subquery = (
diff --git a/keep/api/models/time_stamp.py b/keep/api/models/time_stamp.py
new file mode 100644
index 000000000..67c910538
--- /dev/null
+++ b/keep/api/models/time_stamp.py
@@ -0,0 +1,10 @@
+from typing import Optional
+from pydantic import BaseModel, Field
+from datetime import datetime
+class TimeStampFilter(BaseModel):
+    lower_timestamp: Optional[datetime] = Field(None, alias='start')
+    upper_timestamp: Optional[datetime] = Field(None, alias='end')
+
+    class Config:
+        allow_population_by_field_name = True
+        
\ No newline at end of file
diff --git a/keep/api/routes/mapping.py b/keep/api/routes/mapping.py
index e5cfbc4a9..bb4788af3 100644
--- a/keep/api/routes/mapping.py
+++ b/keep/api/routes/mapping.py
@@ -38,7 +38,12 @@ def get_rules(
             attributes = []
             if rule_dto.type == "csv":
                 attributes = [
-                    key for key in rule.rows[0].keys() if key not in rule.matchers
+                    key
+                    for key in rule.rows[0].keys()
+                    if not any(
+                        key in matcher.replace(" ", "").split("&&")
+                        for matcher in rule.matchers
+                    )
                 ]
             elif rule_dto.type == "topology":
                 attributes = [
diff --git a/keep/api/routes/preset.py b/keep/api/routes/preset.py
index ec84d25f8..b3703f0bc 100644
--- a/keep/api/routes/preset.py
+++ b/keep/api/routes/preset.py
@@ -2,7 +2,7 @@
 import os
 import uuid
 from datetime import datetime
-
+from typing import Optional
 from fastapi import (
     APIRouter,
     BackgroundTasks,
@@ -10,6 +10,7 @@
     HTTPException,
     Request,
     Response,
+    Query
 )
 from pydantic import BaseModel
 from sqlmodel import Session, select
@@ -23,6 +24,7 @@
     update_provider_last_pull_time,
 )
 from keep.api.models.alert import AlertDto
+from keep.api.models.time_stamp import TimeStampFilter
 from keep.api.models.db.preset import (
     Preset,
     PresetDto,
@@ -39,6 +41,7 @@
 from keep.providers.base.base_provider import BaseTopologyProvider
 from keep.providers.providers_factory import ProvidersFactory
 from keep.searchengine.searchengine import SearchEngine
+import json
 
 router = APIRouter()
 logger = logging.getLogger(__name__)
@@ -169,6 +172,20 @@ def pull_data_from_providers(
     )
 
 
+# Function to handle the time_stamp query parameter and parse it
+def _get_time_stamp_filter(
+    time_stamp: Optional[str] = Query(None)
+) -> TimeStampFilter:
+    if time_stamp:
+        try:
+            # Parse the JSON string
+            time_stamp_dict = json.loads(time_stamp)
+            # Return the TimeStampFilter object, Pydantic will map 'from' -> lower_timestamp and 'to' -> upper_timestamp
+            return TimeStampFilter(**time_stamp_dict)
+        except (json.JSONDecodeError, TypeError):
+            raise HTTPException(status_code=400, detail="Invalid time_stamp format")
+    return TimeStampFilter()
+
 @router.get(
     "",
     description="Get all presets for tenant",
@@ -178,9 +195,10 @@ def get_presets(
         IdentityManagerFactory.get_auth_verifier(["read:preset"])
     ),
     session: Session = Depends(get_session),
+    time_stamp: TimeStampFilter = Depends(_get_time_stamp_filter)
 ) -> list[PresetDto]:
     tenant_id = authenticated_entity.tenant_id
-    logger.info("Getting all presets")
+    logger.info(f"Getting all presets {time_stamp}")
 
     # get all preset ids that the user has access to
     identity_manager = IdentityManagerFactory.get_identity_manager(
@@ -205,7 +223,7 @@ def get_presets(
     # get the number of alerts + noisy alerts for each preset
     search_engine = SearchEngine(tenant_id=tenant_id)
     # get the preset metatada
-    presets_dto = search_engine.search_preset_alerts(presets=presets_dto)
+    presets_dto = search_engine.search_preset_alerts(presets=presets_dto, time_stamp=time_stamp)
 
     return presets_dto
 
diff --git a/keep/providers/ilert_provider/ilert_provider.py b/keep/providers/ilert_provider/ilert_provider.py
index 1fcfff87d..748e67c63 100644
--- a/keep/providers/ilert_provider/ilert_provider.py
+++ b/keep/providers/ilert_provider/ilert_provider.py
@@ -1,5 +1,5 @@
 """
-Ilert Provider is a class that allows to create/close incidents in Ilert.
+ilert Provider is a class that allows to create/close incidents in ilert.
 """
 
 import dataclasses
@@ -20,7 +20,7 @@
 
 class IlertIncidentStatus(str, enum.Enum):
     """
-    Ilert incident status.
+    ilert incident status.
     """
 
     INVESTIGATING = "INVESTIGATING"
@@ -32,7 +32,7 @@ class IlertIncidentStatus(str, enum.Enum):
 @pydantic.dataclasses.dataclass
 class IlertProviderAuthConfig:
     """
-    Ilert authentication configuration.
+    ilert authentication configuration.
     """
 
     ilert_token: str = dataclasses.field(
@@ -54,8 +54,9 @@ class IlertProviderAuthConfig:
 
 
 class IlertProvider(BaseProvider):
-    """Create/Resolve incidents in Ilert."""
+    """Create/Resolve incidents in ilert."""
 
+    PROVIDER_DISPLAY_NAME = "ilert"
     PROVIDER_SCOPES = [
         ProviderScope("read_permission", "Read permission", mandatory=True),
         ProviderScope("write_permission", "Write permission", mandatory=False),
@@ -89,7 +90,7 @@ def dispose(self):
 
     def validate_config(self):
         """
-        Validates required configuration for Ilert provider.
+        Validates required configuration for ilert provider.
 
         """
         self.authentication_config = IlertProviderAuthConfig(
@@ -123,10 +124,10 @@ def validate_scopes(self):
 
     def _query(self, incident_id: str, **kwargs):
         """
-        Query Ilert incident.
+        Query ilert incident.
         """
         self.logger.info(
-            "Querying Ilert incident",
+            "Querying ilert incident",
             extra={
                 "incident_id": incident_id,
                 **kwargs,
@@ -139,24 +140,24 @@ def _query(self, incident_id: str, **kwargs):
         )
         if not response.ok:
             self.logger.error(
-                "Failed to query Ilert incident",
+                "Failed to query ilert incident",
                 extra={
                     "status_code": response.status_code,
                     "response": response.text,
                 },
             )
             raise Exception(
-                f"Failed to query Ilert incident: {response.status_code} {response.text}"
+                f"Failed to query ilert incident: {response.status_code} {response.text}"
             )
         self.logger.info(
-            "Ilert incident queried",
+            "ilert incident queried",
             extra={"status_code": response.status_code},
         )
         return response.json()
 
     def _get_alerts(self) -> list[AlertDto]:
         """
-        Get incidents from Ilert.
+        Get incidents from ilert.
         """
         if not self.authentication_config.ilert_host.endswith("/api"):
             self.authentication_config.ilert_host = (
@@ -217,7 +218,7 @@ def __create_or_update_incident(
         self, summary, status, message, affectedServices, id
     ):
         self.logger.info(
-            "Creating/updating Ilert incident",
+            "Creating/updating ilert incident",
             extra={
                 "summary": summary,
                 "status": status,
@@ -271,17 +272,17 @@ def __create_or_update_incident(
 
         if not response.ok:
             self.logger.error(
-                "Failed to create/update Ilert incident",
+                "Failed to create/update ilert incident",
                 extra={
                     "status_code": response.status_code,
                     "response": response.text,
                 },
             )
             raise Exception(
-                f"Failed to create/update Ilert incident: {response.status_code} {response.text}"
+                f"Failed to create/update ilert incident: {response.status_code} {response.text}"
             )
         self.logger.info(
-            "Ilert incident created/updated",
+            "ilert incident created/updated",
             extra={"status_code": response.status_code},
         )
         return response.json()
@@ -308,13 +309,13 @@ def __post_ilert_event(
             "links": links,
             "customDetails": custom_details,
         }
-        self.logger.info("Posting Ilert event", extra=payload)
+        self.logger.info("Posting ilert event", extra=payload)
         response = requests.post(
             f"{self.authentication_config.ilert_host}/events/keep/{self.authentication_config.ilert_token} ",
             json=payload,
         )
         self.logger.info(
-            "Ilert event posted", extra={"status_code": response.status_code}
+            "ilert event posted", extra={"status_code": response.status_code}
         )
         return response.json()
 
@@ -335,7 +336,7 @@ def _notify(
         custom_details: dict = {},
         **kwargs: dict,
     ):
-        self.logger.info("Notifying Ilert", extra=locals())
+        self.logger.info("Notifying ilert", extra=locals())
         if _type == "incident":
             return self.__create_or_update_incident(
                 summary, status, message, affectedServices, id
diff --git a/keep/searchengine/searchengine.py b/keep/searchengine/searchengine.py
index 749b48a02..1a4fd1099 100644
--- a/keep/searchengine/searchengine.py
+++ b/keep/searchengine/searchengine.py
@@ -9,6 +9,7 @@
 from keep.api.models.db.preset import PresetDto, PresetSearchQuery
 from keep.api.utils.enrichment_helpers import convert_db_alerts_to_dto_alerts
 from keep.rulesengine.rulesengine import RulesEngine
+from keep.api.models.time_stamp import TimeStampFilter
 
 
 class SearchMode(enum.Enum):
@@ -51,19 +52,23 @@ def __init__(self, tenant_id):
             extra={"tenant_id": self.tenant_id, "search_mode": self.search_mode},
         )
 
-    def _get_last_alerts(self, limit=1000, timeframe: int = 0) -> list[AlertDto]:
+    def _get_last_alerts(self, limit=1000, timeframe: int = 0, time_stamp:TimeStampFilter=None) -> list[AlertDto]:
         """Get the last alerts
 
         Returns:
             list[AlertDto]: The list of alerts
         """
         self.logger.info("Getting last alerts")
+        lower_timestamp = time_stamp.lower_timestamp if time_stamp else None
+        upper_timestamp = time_stamp.upper_timestamp if time_stamp else None
+
         alerts = get_last_alerts(
-            tenant_id=self.tenant_id, limit=limit, timeframe=timeframe
+            tenant_id=self.tenant_id, limit=limit, timeframe=timeframe,
+            lower_timestamp=lower_timestamp, upper_timestamp=upper_timestamp
         )
         # convert the alerts to DTO
         alerts_dto = convert_db_alerts_to_dto_alerts(alerts)
-        self.logger.info("Finished getting last alerts")
+        self.logger.info(f"Finished getting last alerts {lower_timestamp} {upper_timestamp} {time_stamp}")
         return alerts_dto
 
     def search_alerts_by_cel(
@@ -150,7 +155,8 @@ def search_alerts(self, query: PresetSearchQuery) -> list[AlertDto]:
         return filtered_alerts
 
     def search_preset_alerts(
-        self, presets: list[PresetDto]
+        self, presets: list[PresetDto],
+        time_stamp: TimeStampFilter = None
     ) -> dict[str, list[AlertDto]]:
         """Search for alerts based on a list of queries
 
@@ -168,7 +174,7 @@ def search_preset_alerts(
         # if internal
         if self.search_mode == SearchMode.INTERNAL:
             # get the alerts
-            alerts_dto = self._get_last_alerts()
+            alerts_dto = self._get_last_alerts(time_stamp=time_stamp)
             # performance optimization: get the alerts activation once
             alerts_activation = self.rule_engine.get_alerts_activation(alerts_dto)
             for preset in presets:
diff --git a/tests/test_enrichments.py b/tests/test_enrichments.py
index e75c99a24..b06ae8692 100644
--- a/tests/test_enrichments.py
+++ b/tests/test_enrichments.py
@@ -617,3 +617,96 @@ def test_topology_mapping_rule_enrichment(mock_session, mock_alert_dto):
                 force=False,
                 audit_enabled=True,
             )
+
+
+def test_run_mapping_rules_with_complex_matchers(mock_session, mock_alert_dto):
+    # Setup a mapping rule with complex matchers
+    rule = MappingRule(
+        id=1,
+        tenant_id="test_tenant",
+        priority=1,
+        matchers=["name && severity", "source"],
+        rows=[
+            {
+                "name": "Test Alert",
+                "severity": "high",
+                "service": "high_priority_service",
+            },
+            {
+                "name": "Test Alert",
+                "severity": "low",
+                "service": "low_priority_service",
+            },
+            {"source": "test_source", "service": "source_specific_service"},
+        ],
+        disabled=False,
+        type="csv",
+    )
+    mock_session.query.return_value.filter.return_value.filter.return_value.order_by.return_value.all.return_value = [
+        rule
+    ]
+
+    enrichment_bl = EnrichmentsBl(tenant_id="test_tenant", db=mock_session)
+
+    # Test case 1: Matches "name && severity"
+    mock_alert_dto.name = "Test Alert"
+    mock_alert_dto.severity = "high"
+    enrichment_bl.run_mapping_rules(mock_alert_dto)
+    assert mock_alert_dto.service == "high_priority_service"
+
+    # Test case 2: Matches "name && severity" (different severity)
+    mock_alert_dto.severity = "low"
+    del mock_alert_dto.service
+    enrichment_bl.run_mapping_rules(mock_alert_dto)
+    assert mock_alert_dto.service == "low_priority_service"
+
+    # Test case 3: Matches "source"
+    mock_alert_dto.name = "Different Alert"
+    mock_alert_dto.severity = "medium"
+    mock_alert_dto.source = ["test_source"]
+    del mock_alert_dto.service
+    enrichment_bl.run_mapping_rules(mock_alert_dto)
+    assert mock_alert_dto.service == "source_specific_service"
+
+    # Test case 4: No match
+    mock_alert_dto.name = "Unmatched Alert"
+    mock_alert_dto.severity = "medium"
+    mock_alert_dto.source = ["different_source"]
+    del mock_alert_dto.service
+    enrichment_bl.run_mapping_rules(mock_alert_dto)
+    assert not hasattr(mock_alert_dto, "service")
+
+
+def test_run_mapping_rules_enrichments_filtering(mock_session, mock_alert_dto):
+    # Setup a mapping rule with complex matchers and multiple enrichment fields
+    rule = MappingRule(
+        id=1,
+        tenant_id="test_tenant",
+        priority=1,
+        matchers=["name && severity"],
+        rows=[
+            {
+                "name": "Test Alert",
+                "severity": "high",
+                "service": "high_priority_service",
+                "team": "on-call",
+                "priority": "P1",
+            },
+        ],
+        disabled=False,
+        type="csv",
+    )
+    mock_session.query.return_value.filter.return_value.filter.return_value.order_by.return_value.all.return_value = [
+        rule
+    ]
+
+    enrichment_bl = EnrichmentsBl(tenant_id="test_tenant", db=mock_session)
+
+    # Test case: Matches "name && severity" and applies multiple enrichments
+    mock_alert_dto.name = "Test Alert"
+    mock_alert_dto.severity = "high"
+    enrichment_bl.run_mapping_rules(mock_alert_dto)
+
+    assert mock_alert_dto.service == "high_priority_service"
+    assert mock_alert_dto.team == "on-call"
+    assert mock_alert_dto.priority == "P1"