diff --git a/frontend/src/components/QueryBuilderV2/QueryAddOns/HavingFilter/HavingFilter.tsx b/frontend/src/components/QueryBuilderV2/QueryAddOns/HavingFilter/HavingFilter.tsx
new file mode 100644
index 000000000000..99662e3df570
--- /dev/null
+++ b/frontend/src/components/QueryBuilderV2/QueryAddOns/HavingFilter/HavingFilter.tsx
@@ -0,0 +1,99 @@
+import { Button, Select } from 'antd';
+import { useEffect, useState } from 'react';
+
+const havingOperators = [
+	{
+		label: '=',
+		value: '=',
+	},
+	{
+		label: '!=',
+		value: '!=',
+	},
+	{
+		label: '>',
+		value: '>',
+	},
+	{
+		label: '<',
+		value: '<',
+	},
+	{
+		label: '>=',
+		value: '>=',
+	},
+	{
+		label: '<=',
+		value: '<=',
+	},
+	{
+		label: 'IN',
+		value: 'IN',
+	},
+	{
+		label: 'NOT_IN',
+		value: 'NOT_IN',
+	},
+];
+
+function HavingFilter({
+	selectedAggreateOptions,
+	onClose,
+}: {
+	selectedAggreateOptions: { func: string; arg: string }[];
+	onClose: () => void;
+}): JSX.Element {
+	const [selectedHavingOptions, setSelectedHavingOptions] = useState<string[]>(
+		[],
+	);
+
+	const [options, setOptions] = useState<{ label: string; value: string }[]>([]);
+
+	useEffect(() => {
+		const options = [];
+
+		for (let i = 0; i < selectedAggreateOptions.length; i++) {
+			const opt = selectedAggreateOptions[i];
+
+			for (let j = 0; j < havingOperators.length; j++) {
+				const operator = havingOperators[j];
+
+				options.push({
+					label: `${opt.func}(${opt.arg}) ${operator.label}`,
+					value: `${opt.func}(${opt.arg}) ${operator.label}`,
+				});
+			}
+		}
+
+		console.log('options', options);
+
+		setOptions(options);
+	}, [selectedAggreateOptions]);
+
+	console.log(
+		'selectedHavingOptions',
+		selectedHavingOptions,
+		selectedAggreateOptions,
+		setSelectedHavingOptions,
+	);
+
+	console.log('options', options);
+
+	return (
+		<div className="having-filter-container">
+			<Select
+				mode="multiple"
+				options={options}
+				onChange={(value): void => {
+					setSelectedHavingOptions(value);
+				}}
+				style={{ width: '100%' }}
+			/>
+			<Button className="close-btn periscope-btn ghost" onClick={onClose}>
+				Close
+			</Button>
+		</div>
+	);
+}
+
+export default HavingFilter;
diff --git a/frontend/src/components/QueryBuilderV2/QueryAddOns/QueryAddOns.tsx b/frontend/src/components/QueryBuilderV2/QueryAddOns/QueryAddOns.tsx
index dc63513c0a7a..56e492fc4caf 100644
--- a/frontend/src/components/QueryBuilderV2/QueryAddOns/QueryAddOns.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryAddOns/QueryAddOns.tsx
@@ -8,6 +8,8 @@ import { useCallback, useState } from 'react';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
+import HavingFilter from './HavingFilter/HavingFilter';
+
 interface AddOn {
 	icon: React.ReactNode;
 	label: string;
@@ -46,10 +48,12 @@ function QueryAddOns({
 	query,
 	version,
 	isListViewPanel,
+	selectedAggreateOptions,
 }: {
 	query: IBuilderQuery;
 	version: string;
 	isListViewPanel: boolean;
+	selectedAggreateOptions: { func: string; arg: string }[];
 }): JSX.Element {
 	const [selectedViews, setSelectedViews] = useState<AddOn[]>([]);
 
@@ -118,9 +122,8 @@ function QueryAddOns({
 					)}
 					{selectedViews.find((view) => view.key === 'having') && (
 						<div className="add-on-content">
-							<InputWithLabel
-								label="Having"
-								placeholder="Select a field"
+							<HavingFilter
+								selectedAggreateOptions={selectedAggreateOptions}
 								onClose={(): void => {
 									setSelectedViews(
 										selectedViews.filter((view) => view.key !== 'having'),
@@ -134,7 +137,6 @@ function QueryAddOns({
 							<InputWithLabel
 								label="Limit"
 								placeholder="Select a field"
-								type="number"
 								onClose={(): void => {
 									setSelectedViews(selectedViews.filter((view) => view.key !== 'limit'));
 								}}
diff --git a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.styles.scss b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.styles.scss
index d590c434aa63..764b086c7e01 100644
--- a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.styles.scss
+++ b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.styles.scss
@@ -154,7 +154,8 @@
 					background: rgba(36, 40, 52, 1) !important;
 					color: var(--bg-vanilla-100) !important;
 					border-radius: 4px;
-					padding: 2px 8px;
+					padding: 2px 4px;
+					margin-right: 4px;
 				}
 			}
 
diff --git a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.tsx b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.tsx
index 17475d1f46e7..3a91caf6c723 100644
--- a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregation.tsx
@@ -1,19 +1,19 @@
 import './QueryAggregation.styles.scss';
 
-// import { Input } from 'antd';
 import InputWithLabel from 'components/InputWithLabel/InputWithLabel';
 
 import QueryAggregationSelect from './QueryAggregationSelect';
 
-function QueryAggregationOptions(): JSX.Element {
+function QueryAggregationOptions({
+	onAggregationOptionsSelect,
+}: {
+	onAggregationOptionsSelect: (value: { func: string; arg: string }[]) => void;
+}): JSX.Element {
 	return (
 		<div className="query-aggregation-container">
-			{/* <Input
-				placeholder="Search aggregation options..."
-				className="query-aggregation-options-input"
-			/> */}
-
-			<QueryAggregationSelect />
+			<QueryAggregationSelect
+				onAggregationOptionsSelect={onAggregationOptionsSelect}
+			/>
 
 			<div className="query-aggregation-interval">
 				<div className="query-aggregation-interval-label">every</div>
diff --git a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
index bc89df4f5b61..1776deb74728 100644
--- a/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryAggregation/QueryAggregationSelect.tsx
@@ -110,7 +110,11 @@ function getFunctionContextAtCursor(
 }
 
 // eslint-disable-next-line react/no-this-in-sfc
-function QueryAggregationSelect(): JSX.Element {
+function QueryAggregationSelect({
+	onAggregationOptionsSelect,
+}: {
+	onAggregationOptionsSelect: (value: { func: string; arg: string }[]) => void;
+}): JSX.Element {
 	const { currentQuery } = useQueryBuilder();
 	const queryData = currentQuery.builder.queryData[0];
 	const [input, setInput] = useState('');
@@ -142,6 +146,8 @@ function QueryAggregationSelect(): JSX.Element {
 			});
 		}
 		setFunctionArgPairs(pairs);
+		onAggregationOptionsSelect(pairs);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [input]);
 
 	// Find function context for fetching suggestions
diff --git a/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx b/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx
index 746cb87e4585..bdb5041a9159 100644
--- a/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx
+++ b/frontend/src/components/QueryBuilderV2/QueryBuilderV2.tsx
@@ -1,6 +1,7 @@
 import './QueryBuilderV2.styles.scss';
 
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { useState } from 'react';
 
 import QueryAddOns from './QueryAddOns/QueryAddOns';
 import QueryAggregation from './QueryAggregation/QueryAggregation';
@@ -9,14 +10,25 @@ import QuerySearch from './QuerySearch/QuerySearch';
 function QueryBuilderV2(): JSX.Element {
 	const { currentQuery } = useQueryBuilder();
 
+	const [selectedAggreateOptions, setSelectedAggreateOptions] = useState<
+		{ func: string; arg: string }[]
+	>([]);
+
+	console.log('selectedAggreateOptions', selectedAggreateOptions);
+
 	return (
 		<div className="query-builder-v2">
 			<QuerySearch />
-			<QueryAggregation />
+			<QueryAggregation
+				onAggregationOptionsSelect={(pairs): void => {
+					setSelectedAggreateOptions(pairs);
+				}}
+			/>
 			<QueryAddOns
 				query={currentQuery.builder.queryData[0]}
 				version="v3"
 				isListViewPanel={false}
+				selectedAggreateOptions={selectedAggreateOptions}
 			/>
 		</div>
 	);