diff --git a/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx b/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx
index 5951c5446d8..a13efabc4c2 100644
--- a/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx
+++ b/packages/grafana-ui/src/components/AlphaNotice/AlphaNotice.tsx
@@ -1,22 +1,15 @@
 import React, { FC, useContext } from 'react';
 import { css, cx } from 'emotion';
 import { PluginState, ThemeContext } from '../../index';
-import { Tooltip } from '../index';
 
 interface Props {
   state?: PluginState;
-  text?: JSX.Element;
+  text?: string;
   className?: string;
 }
 
 export const AlphaNotice: FC<Props> = ({ state, text, className }) => {
-  const tooltipContent = text || (
-    <div>
-      <h5>Alpha Feature</h5>
-      <p>This feature is a work in progress and updates may include breaking changes.</p>
-    </div>
-  );
-
+  const tooltipContent = text || 'This feature is a work in progress and updates may include breaking changes';
   const theme = useContext(ThemeContext);
 
   const styles = cx(
@@ -35,10 +28,8 @@ export const AlphaNotice: FC<Props> = ({ state, text, className }) => {
   );
 
   return (
-    <Tooltip content={tooltipContent} theme={'info'} placement={'top'}>
-      <div className={styles}>
-        <i className="fa fa-warning" /> {state}
-      </div>
-    </Tooltip>
+    <div className={styles} title={tooltipContent}>
+      <i className="fa fa-warning" /> {state}
+    </div>
   );
 };
diff --git a/public/app/features/dashboard/panel_editor/QueriesTab.tsx b/public/app/features/dashboard/panel_editor/QueriesTab.tsx
index dacdbcea94b..98d68f3d90b 100644
--- a/public/app/features/dashboard/panel_editor/QueriesTab.tsx
+++ b/public/app/features/dashboard/panel_editor/QueriesTab.tsx
@@ -287,7 +287,7 @@ export class QueriesTab extends PureComponent<Props, State> {
             <PanelOptionsGroup
               title={
                 <>
-                  Transform query results
+                  Query results
                   <AlphaNotice
                     state={PluginState.alpha}
                     className={css`
diff --git a/public/app/features/dashboard/panel_editor/QueryOptions.tsx b/public/app/features/dashboard/panel_editor/QueryOptions.tsx
index c0099022650..2bdce086782 100644
--- a/public/app/features/dashboard/panel_editor/QueryOptions.tsx
+++ b/public/app/features/dashboard/panel_editor/QueryOptions.tsx
@@ -168,9 +168,11 @@ export class QueryOptions extends PureComponent<Props, State> {
     return Object.keys(this.allOptions).map(key => {
       const options = this.allOptions[key];
       const panelKey = options.panelKey || key;
+
       // @ts-ignore
       const value = this.state[panelKey];
-      if (value || queryOptions[key]) {
+
+      if (queryOptions[key]) {
         return (
           <DataSourceOption
             key={key}
diff --git a/public/app/features/plugins/PluginStateInfo.tsx b/public/app/features/plugins/PluginStateInfo.tsx
index e398c14c4bf..491c0c76b89 100644
--- a/public/app/features/plugins/PluginStateInfo.tsx
+++ b/public/app/features/plugins/PluginStateInfo.tsx
@@ -6,23 +6,12 @@ interface Props {
   state?: PluginState;
 }
 
-function getPluginStateInfoText(state?: PluginState): JSX.Element | null {
+function getPluginStateInfoText(state?: PluginState): string | null {
   switch (state) {
     case PluginState.alpha:
-      return (
-        <div>
-          <h5>Alpha Plugin</h5>
-          <p>This plugin is a work in progress and updates may include breaking changes.</p>
-        </div>
-      );
-
+      return 'Alpha Plugin: This plugin is a work in progress and updates may include breaking changes';
     case PluginState.beta:
-      return (
-        <div>
-          <h5>Beta Plugin</h5>
-          <p>There could be bugs and minor breaking changes to this plugin.</p>
-        </div>
-      );
+      return 'Beta Plugin: There could be bugs and minor breaking changes to this plugin';
   }
   return null;
 }