diff --git a/.changeset/full-parrots-crash.md b/.changeset/full-parrots-crash.md
new file mode 100644
index 0000000..9ae2fb4
--- /dev/null
+++ b/.changeset/full-parrots-crash.md
@@ -0,0 +1,5 @@
+---
+'grafana-zabbix': minor
+---
+
+Support adding custom values in dropdowns for all query types
diff --git a/src/components/MetricPicker/MetricPicker.tsx b/src/components/MetricPicker/MetricPicker.tsx
index 84eff49..ee27c6b 100644
--- a/src/components/MetricPicker/MetricPicker.tsx
+++ b/src/components/MetricPicker/MetricPicker.tsx
@@ -9,10 +9,11 @@ export interface Props {
   isLoading?: boolean;
   options: Array<ComboboxOption<string>>;
   width?: number;
+  createCustomValue?: boolean;
   onChange: (value: string) => void;
 }
 
-export const MetricPicker = ({ value, placeholder, options, isLoading, width, onChange }: Props) => {
+export const MetricPicker = ({ value, placeholder, options, isLoading, width, onChange, createCustomValue }: Props) => {
   const ref = useRef<HTMLDivElement>(null);
 
   const onMenuOptionSelect = (option: SelectableValue<string>) => {
@@ -23,6 +24,7 @@ export const MetricPicker = ({ value, placeholder, options, isLoading, width, on
   return (
     <div data-testid="role-picker" style={{ position: 'relative' }} ref={ref}>
       <Combobox<string>
+        createCustomValue={createCustomValue ?? false}
         width={width}
         value={value}
         options={options ?? []}
diff --git a/src/datasource/components/QueryEditor/HostTagQueryEditor.tsx b/src/datasource/components/QueryEditor/HostTagQueryEditor.tsx
index a0afcf1..337ded1 100644
--- a/src/datasource/components/QueryEditor/HostTagQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/HostTagQueryEditor.tsx
@@ -105,6 +105,7 @@ export const HostTagQueryEditor = ({
                 options={hostTagOptions ?? []}
                 width={19}
                 loading={hostTagOptionsLoading}
+                createCustomValue={true}
               />
               <Combobox
                 value={filter.operator}
diff --git a/src/datasource/components/QueryEditor/MetricsQueryEditor.tsx b/src/datasource/components/QueryEditor/MetricsQueryEditor.tsx
index ece283d..e4b8bd8 100644
--- a/src/datasource/components/QueryEditor/MetricsQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/MetricsQueryEditor.tsx
@@ -239,6 +239,7 @@ export const MetricsQueryEditor = ({ query, datasource, onChange, onItemCountCha
             isLoading={groupsLoading}
             onChange={onFilterChange('group')}
             placeholder="Group name"
+            createCustomValue={true}
           />
         </InlineField>
         <InlineField label="Host tag" labelWidth={12}>
@@ -259,6 +260,7 @@ export const MetricsQueryEditor = ({ query, datasource, onChange, onItemCountCha
             isLoading={hostsLoading}
             onChange={onFilterChange('host')}
             placeholder="Host name"
+            createCustomValue={true}
           />
         </InlineField>
       </QueryEditorRow>
@@ -271,6 +273,7 @@ export const MetricsQueryEditor = ({ query, datasource, onChange, onItemCountCha
               options={appOptions}
               isLoading={appsLoading}
               onChange={onFilterChange('application')}
+              createCustomValue={true}
               placeholder="Application name"
             />
           </InlineField>
@@ -283,6 +286,7 @@ export const MetricsQueryEditor = ({ query, datasource, onChange, onItemCountCha
               options={tagOptions}
               isLoading={tagsLoading}
               onChange={onFilterChange('itemTag')}
+              createCustomValue={true}
               placeholder="Item tag name"
             />
           </InlineField>
@@ -294,6 +298,7 @@ export const MetricsQueryEditor = ({ query, datasource, onChange, onItemCountCha
             options={itemOptions}
             isLoading={itemsLoading}
             onChange={onFilterChange('item')}
+            createCustomValue={true}
             placeholder="Item name"
           />
         </InlineField>
diff --git a/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx b/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
index dc44831..916cfa4 100644
--- a/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
@@ -166,6 +166,7 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
             options={groupsOptions}
             isLoading={groupsLoading}
             onChange={onFilterChange('group')}
+            createCustomValue={true}
             placeholder="Group name"
           />
         </InlineField>
@@ -176,6 +177,7 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
             options={hostOptions}
             isLoading={hostsLoading}
             onChange={onFilterChange('host')}
+            createCustomValue={true}
             placeholder="Host name"
           />
         </InlineField>
@@ -186,6 +188,7 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
             options={proxiesOptions}
             isLoading={proxiesLoading}
             onChange={onFilterChange('proxy')}
+            createCustomValue={true}
             placeholder="Proxy name"
           />
         </InlineField>
@@ -199,6 +202,7 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
               options={appOptions}
               isLoading={appsLoading}
               onChange={onFilterChange('application')}
+              createCustomValue={true}
               placeholder="Application name"
             />
           </InlineField>
diff --git a/src/datasource/components/QueryEditor/ServicesQueryEditor.tsx b/src/datasource/components/QueryEditor/ServicesQueryEditor.tsx
index ee889d8..0e006b7 100644
--- a/src/datasource/components/QueryEditor/ServicesQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/ServicesQueryEditor.tsx
@@ -95,6 +95,7 @@ export const ServicesQueryEditor = ({ query, datasource, onChange }: Props) => {
             options={itServicesOptions}
             isLoading={itServicesLoading}
             onChange={onStringPropChange('itServiceFilter')}
+            createCustomValue={true}
             placeholder="Service name"
           />
         </InlineField>
@@ -105,6 +106,7 @@ export const ServicesQueryEditor = ({ query, datasource, onChange }: Props) => {
             options={slaOptions}
             isLoading={slaLoading}
             onChange={onStringPropChange('slaFilter')}
+            createCustomValue={true}
             placeholder="SLA name"
           />
         </InlineField>
diff --git a/src/datasource/components/QueryEditor/TextMetricsQueryEditor.tsx b/src/datasource/components/QueryEditor/TextMetricsQueryEditor.tsx
index d7f3d7b..cef9ac8 100644
--- a/src/datasource/components/QueryEditor/TextMetricsQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/TextMetricsQueryEditor.tsx
@@ -144,6 +144,7 @@ export const TextMetricsQueryEditor = ({ query, datasource, onChange }: Props) =
             options={groupsOptions}
             isLoading={groupsLoading}
             onChange={onFilterChange('group')}
+            createCustomValue={true}
             placeholder="Group name"
           />
         </InlineField>
@@ -154,6 +155,7 @@ export const TextMetricsQueryEditor = ({ query, datasource, onChange }: Props) =
             options={hostOptions}
             isLoading={hostsLoading}
             onChange={onFilterChange('host')}
+            createCustomValue={true}
             placeholder="Host name"
           />
         </InlineField>
@@ -166,6 +168,7 @@ export const TextMetricsQueryEditor = ({ query, datasource, onChange }: Props) =
             options={appOptions}
             isLoading={appsLoading}
             onChange={onFilterChange('application')}
+            createCustomValue={true}
             placeholder="Application name"
           />
         </InlineField>
@@ -176,6 +179,7 @@ export const TextMetricsQueryEditor = ({ query, datasource, onChange }: Props) =
             options={itemOptions}
             isLoading={itemsLoading}
             onChange={onFilterChange('item')}
+            createCustomValue={true}
             placeholder="Item name"
           />
         </InlineField>
diff --git a/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx b/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx
index 3173fbf..cde4e37 100644
--- a/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx
@@ -230,6 +230,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
             isLoading={groupsLoading}
             onChange={onFilterChange('group')}
             placeholder="Group name"
+            createCustomValue={true}
           />
         </InlineField>
         <InlineField label="Host" labelWidth={12}>
@@ -239,6 +240,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
             options={hostOptions}
             isLoading={hostsLoading}
             onChange={onFilterChange('host')}
+            createCustomValue={true}
             placeholder="Host name"
           />
         </InlineField>
@@ -250,6 +252,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
               options={proxiesOptions}
               isLoading={proxiesLoading}
               onChange={onFilterChange('proxy')}
+              createCustomValue={true}
               placeholder="Proxy name"
             />
           </InlineField>
@@ -264,6 +267,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
               options={appOptions}
               isLoading={appsLoading}
               onChange={onFilterChange('application')}
+              createCustomValue={true}
               placeholder="Application name"
             />
           </InlineField>
@@ -276,6 +280,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
               options={tagOptions}
               isLoading={tagsLoading}
               onChange={onFilterChange('itemTag')}
+              createCustomValue={true}
               placeholder="Item tag name"
             />
           </InlineField>
@@ -300,6 +305,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
               options={itemOptions}
               isLoading={itemsLoading}
               onChange={onFilterChange('item')}
+              createCustomValue={true}
               placeholder="Item name"
             />
           </InlineField>
diff --git a/src/datasource/components/QueryEditor/UserMacrosQueryEditor.tsx b/src/datasource/components/QueryEditor/UserMacrosQueryEditor.tsx
index 64a9490..57affa1 100644
--- a/src/datasource/components/QueryEditor/UserMacrosQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/UserMacrosQueryEditor.tsx
@@ -101,6 +101,7 @@ export const UserMacrosQueryEditor = ({ query, datasource, onChange }: Props) =>
             options={groupsOptions}
             isLoading={groupsLoading}
             onChange={onFilterChange('group')}
+            createCustomValue={true}
             placeholder="Group name"
           />
         </InlineField>
@@ -111,6 +112,7 @@ export const UserMacrosQueryEditor = ({ query, datasource, onChange }: Props) =>
             options={hostOptions}
             isLoading={hostsLoading}
             onChange={onFilterChange('host')}
+            createCustomValue={true}
             placeholder="Host name"
           />
         </InlineField>
@@ -123,6 +125,7 @@ export const UserMacrosQueryEditor = ({ query, datasource, onChange }: Props) =>
             options={macrosOptions}
             isLoading={macrosLoading}
             onChange={onFilterChange('macro')}
+            createCustomValue={true}
             placeholder="Macro name"
           />
         </InlineField>