diff --git a/bitmovin-analytics-datasource/src/components/FilterInput.tsx b/bitmovin-analytics-datasource/src/components/FilterInput.tsx
index a34a065..0ab3071 100644
--- a/bitmovin-analytics-datasource/src/components/FilterInput.tsx
+++ b/bitmovin-analytics-datasource/src/components/FilterInput.tsx
@@ -51,7 +51,6 @@ export function FilterInput(props: Props) {
           type="text"
           onChange={(value) => props.onValueChange(value.currentTarget.value)}
           width={30}
-          placeholder="Enter Filter value"
         />
       </Tooltip>
       <IconButton
diff --git a/bitmovin-analytics-datasource/src/components/GroupByInput.tsx b/bitmovin-analytics-datasource/src/components/GroupByInput.tsx
index 1ac2561..b79c7a0 100644
--- a/bitmovin-analytics-datasource/src/components/GroupByInput.tsx
+++ b/bitmovin-analytics-datasource/src/components/GroupByInput.tsx
@@ -4,6 +4,7 @@ import { HorizontalGroup, IconButton, Select } from '@grafana/ui';
 
 import { QueryAttribute } from '../types/queryAttributes';
 import { QueryAdAttribute } from '../types/queryAdAttributes';
+import { isEmpty } from 'lodash';
 
 export enum REORDER_DIRECTION {
   UP,
@@ -23,7 +24,12 @@ type Props = {
 export function GroupByInput(props: Props) {
   return (
     <HorizontalGroup>
-      <Select value={props.groupBy} onChange={props.onChange} options={props.selectableGroupBys} width={30} />
+      <Select
+        value={isEmpty(props.groupBy) ? undefined : props.groupBy}
+        onChange={props.onChange}
+        options={props.selectableGroupBys}
+        width={30}
+      />
       <IconButton
         tooltip="Move down"
         onClick={() => props.onReorderGroupBy(REORDER_DIRECTION.DOWN)}
diff --git a/bitmovin-analytics-datasource/src/components/OrderByInput.tsx b/bitmovin-analytics-datasource/src/components/OrderByInput.tsx
index ebbc281..ed6d816 100644
--- a/bitmovin-analytics-datasource/src/components/OrderByInput.tsx
+++ b/bitmovin-analytics-datasource/src/components/OrderByInput.tsx
@@ -6,6 +6,7 @@ import { QueryAttribute } from '../types/queryAttributes';
 import { QueryAdAttribute } from '../types/queryAdAttributes';
 import { QuerySortOrder } from '../types/queryOrderBy';
 import { REORDER_DIRECTION } from './GroupByInput';
+import { isEmpty } from 'lodash';
 
 type Props = {
   readonly isAdAnalytics: boolean;
@@ -29,7 +30,7 @@ export function OrderByInput(props: Props) {
   return (
     <HorizontalGroup spacing="xs">
       <Select
-        value={props.attribute}
+        value={isEmpty(props.attribute) ? undefined : props.attribute}
         onChange={(value) => props.onAttributeChange(value)}
         options={props.selectableOrderByAttributes}
         width={30}