diff --git a/frontend/app/components/Alerts/AlertForm.js b/frontend/app/components/Alerts/AlertForm.js
index adefd3c22..aed19c654 100644
--- a/frontend/app/components/Alerts/AlertForm.js
+++ b/frontend/app/components/Alerts/AlertForm.js
@@ -50,7 +50,7 @@ const integrationsRoute = client(CLIENT_TABS.INTEGRATIONS);
 const AlertForm = props => {
   const { instance, slackChannels, webhooks, loading, onDelete, deleting, triggerOptions, metricId, style={ width: '580px', height: '100vh' } } = props;
   const write = ({ target: { value, name } }) => props.edit({ [ name ]: value })
-  const writeOption = (e, { name, value }) => props.edit({ [ name ]: value });
+  const writeOption = (e, { name, value }) => props.edit({ [ name ]: value.value });
   const onChangeCheck = ({ target: { checked, name }}) => props.edit({ [ name ]: checked })
   // const onChangeOption = ({ checked, name }) => props.edit({ [ name ]: checked })
   // const onChangeCheck = (e) => { console.log(e) }
@@ -66,7 +66,7 @@ const AlertForm = props => {
 
   const writeQuery = ({ target: { value, name } }) => {
     const { query } = instance;
-    props.edit({ query: { ...query, [name] : value } });
+    props.edit({ query: { ...query, [name] : value.value } });
   }
 
   const metric = (instance && instance.query.left) ? triggerOptions.find(i => i.value === instance.query.left) : null;
@@ -144,7 +144,7 @@ const AlertForm = props => {
                   name="left"
                   value={ triggerOptions.find(i => i.value === instance.query.left) }
                   // onChange={ writeQueryOption }
-                  onChange={ ({ value }) => writeQueryOption(null, { name: 'left', value }) }
+                  onChange={ ({ value }) => writeQueryOption(null, { name: 'left', value: value.value }) }
                 />
               </div>
 
@@ -157,7 +157,7 @@ const AlertForm = props => {
                     name="operator"
                     defaultValue={ instance.query.operator }
                     // onChange={ writeQueryOption }
-                    onChange={ ({ value }) => writeQueryOption(null, { name: 'operator', value }) }
+                    onChange={ ({ value }) => writeQueryOption(null, { name: 'operator', value: value.value }) }
                   />
                   { unit && (
                       <Input
diff --git a/frontend/app/components/Dashboard/components/DashboardSelectionModal/DashboardSelectionModal.tsx b/frontend/app/components/Dashboard/components/DashboardSelectionModal/DashboardSelectionModal.tsx
index 65e8e7051..d1592c3e8 100644
--- a/frontend/app/components/Dashboard/components/DashboardSelectionModal/DashboardSelectionModal.tsx
+++ b/frontend/app/components/Dashboard/components/DashboardSelectionModal/DashboardSelectionModal.tsx
@@ -46,7 +46,7 @@ function DashboardSelectionModal(props: Props) {
                     <Select
                         options={dashboardOptions}
                         defaultValue={dashboardOptions[0].value}
-                        onChange={({ value }: any) => setSelectedId(value)}
+                        onChange={({ value }: any) => setSelectedId(value.value)}
                     />
                 </Form.Field>
             </Modal.Content>
diff --git a/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx b/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx
index 8302800f9..76f752f70 100644
--- a/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx
+++ b/frontend/app/components/shared/CodeSnippet/CodeSnippet.tsx
@@ -10,8 +10,6 @@ const inputModeOptions = [
   
 const inputModeOptionsMap: any = {}
 inputModeOptions.forEach((o: any, i: any) => inputModeOptionsMap[o.value] = i)
-console.log('inputModeOptionsMap', inputModeOptionsMap)
-
 
 interface Props {
     host: string;
diff --git a/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js b/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js
index b7c65d14d..cd8c23707 100644
--- a/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js
+++ b/frontend/app/components/shared/TrackingCodeModal/TrackingCodeModal.js
@@ -44,7 +44,7 @@ class TrackingCodeModal extends React.PureComponent {
             <Icon name="close" size="14" />
           </div>
         </Modal.Header>
-        <Modal.Content className={ styles.content }>
+        <Modal.Content className={ cn(styles.content, 'overflow-y-auto') }>
           <Tabs
             className="px-5"
             tabs={ TABS }
diff --git a/frontend/app/components/ui/Modal/Modal.tsx b/frontend/app/components/ui/Modal/Modal.tsx
index 0d4154426..94eef2248 100644
--- a/frontend/app/components/ui/Modal/Modal.tsx
+++ b/frontend/app/components/ui/Modal/Modal.tsx
@@ -48,7 +48,7 @@ interface ModalContentProps {
 function ModalContent (props: ModalContentProps) {
     const { children, className } = props;
     return (
-        <div className={cn("p-5 overflow-y-auto", className)} style={{ maxHeight: 'calc(100vh - 100px)'}}>
+        <div className={cn("p-5", className)} style={{ maxHeight: 'calc(100vh - 100px)' }}>
             {children}
         </div>
     );