diff --git a/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx b/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
index 1a2c2ec..a7c4a56 100644
--- a/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/ProblemsQueryEditor.tsx
@@ -154,6 +154,8 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
     }
   };
 
+  const supportsApplications = datasource.zabbix.supportsApplications();
+
   return (
     <>
       <QueryEditorRow>
@@ -186,15 +188,17 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
         </InlineField>
       </QueryEditorRow>
       <QueryEditorRow>
-        <InlineField label="Application" labelWidth={12}>
-          <MetricPicker
-            width={24}
-            value={query.application?.filter}
-            options={appOptions}
-            isLoading={appsLoading}
-            onChange={onFilterChange('application')}
-          />
-        </InlineField>
+        {supportsApplications && (
+          <InlineField label="Application" labelWidth={12}>
+            <MetricPicker
+              width={24}
+              value={query.application?.filter}
+              options={appOptions}
+              isLoading={appsLoading}
+              onChange={onFilterChange('application')}
+            />
+          </InlineField>
+        )}
         <InlineField label="Problem" labelWidth={12}>
           <Input
             width={24}
@@ -205,7 +209,7 @@ export const ProblemsQueryEditor = ({ query, datasource, onChange }: Props) => {
         </InlineField>
         <InlineField label="Tags" labelWidth={12}>
           <Input
-            width={24}
+            width={36}
             defaultValue={query.tags?.filter}
             placeholder="tag1:value1, tag2:value2"
             onBlur={onTextFilterChange('tags')}
diff --git a/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx b/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx
index 18fdb0b..18e7920 100644
--- a/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx
+++ b/src/datasource/components/QueryEditor/TriggersQueryEditor.tsx
@@ -260,7 +260,7 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
         )}
       </QueryEditorRow>
       <QueryEditorRow>
-        {(supportsApplications || query.countTriggersBy !== 'items') && (
+        {supportsApplications && (
           <InlineField label="Application" labelWidth={12}>
             <MetricPicker
               width={24}
@@ -292,14 +292,6 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
                 onBlur={onTextFilterChange('trigger')}
               />
             </InlineField>
-            <InlineField label="Tags" labelWidth={12}>
-              <Input
-                width={24}
-                defaultValue={query.tags?.filter}
-                placeholder="tag1:value1, tag2:value2"
-                onBlur={onTextFilterChange('tags')}
-              />
-            </InlineField>
           </>
         )}
         {query.countTriggersBy === 'items' && (
@@ -313,6 +305,16 @@ export const TriggersQueryEditor = ({ query, datasource, onChange }: Props) => {
             />
           </InlineField>
         )}
+        {!supportsApplications && (
+          <InlineField label="Tags" labelWidth={12}>
+            <Input
+              width={24}
+              defaultValue={query.tags?.filter}
+              placeholder="tag1:value1, tag2:value2"
+              onBlur={onTextFilterChange('tags')}
+            />
+          </InlineField>
+        )}
       </QueryEditorRow>
       <QueryEditorRow>
         <InlineField label="Min severity" labelWidth={12}>