Feat/um 145 re add events (#1733)

* Re-add events. Fix event_type queries.

* Re-add eventData

* revert CSS.

components/metrics/FilterTags.js

@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import { safeDecodeURI } from 'next-basics';
-import { Button } from 'react-basics';
+import { Button, Icon } from 'react-basics';
 import Times from 'assets/times.svg';
 import styles from './FilterTags.module.css';
 
@@ -16,8 +16,11 @@ export default function FilterTags({ className, params, onClick }) {
         }
         return (
           <div key={key} className={styles.tag}>
-            <Button icon={<Times />} onClick={() => onClick(key)} variant="action" iconRight>
+            <Button onClick={() => onClick(key)} variant="action" iconRight>
               {`${key}: ${safeDecodeURI(params[key])}`}
+              <Icon>
+                <Times />
+              </Icon>
             </Button>
           </div>
         );